Prepare for 1.19 dev
This commit is contained in:
		
					parent
					
						
							
								f34f678b20
							
						
					
				
			
			
				commit
				
					
						1148687a8d
					
				
			
		
					 1302 changed files with 120 additions and 61 deletions
				
			
		|  | @ -1,45 +0,0 @@ | |||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||||
| From: Spottedleaf <Spottedleaf@users.noreply.github.com> | ||||
| Date: Thu, 31 Mar 2022 05:18:28 -0700 | ||||
| Subject: [PATCH] Guard against invalid entity positions | ||||
| 
 | ||||
| Anything not finite should be blocked and logged | ||||
| 
 | ||||
| diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 | ||||
| index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | ||||
| --- a/src/main/java/net/minecraft/world/entity/Entity.java
 | ||||
| +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 | ||||
| @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
 | ||||
|          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale); | ||||
|      } | ||||
|   | ||||
| +    // Paper start - block invalid positions
 | ||||
| +    public static boolean checkPosition(Entity entity, double newX, double newY, double newZ) {
 | ||||
| +        if (Double.isFinite(newX) && Double.isFinite(newY) && Double.isFinite(newZ)) {
 | ||||
| +            return true;
 | ||||
| +        }
 | ||||
| +
 | ||||
| +        String entityInfo = null;
 | ||||
| +        try {
 | ||||
| +            entityInfo = entity.toString();
 | ||||
| +        } catch (Exception ex) {
 | ||||
| +            entityInfo = "[Entity info unavailable] ";
 | ||||
| +        }
 | ||||
| +        LOGGER.error("New entity position is invalid! Tried to set invalid position (" + newX + "," + newY + "," + newZ + ") for entity " + entity.getClass().getName() + " located at " + entity.position + ", entity info: " + entityInfo, new Throwable());
 | ||||
| +        return false;
 | ||||
| +    }
 | ||||
| +    // Paper end - block invalid positions
 | ||||
| +
 | ||||
|      public final void setPosRaw(double x, double y, double z) { | ||||
|          // Paper start | ||||
|          this.setPosRaw(x, y, z, false); | ||||
|      } | ||||
|      public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) { | ||||
| +        // Paper start - block invalid positions
 | ||||
| +        if (!checkPosition(this, x, y, z)) {
 | ||||
| +            return;
 | ||||
| +        }
 | ||||
| +        // Paper end - block invalid positions
 | ||||
|          // Paper end | ||||
|          // Paper start - fix MC-4 | ||||
|          if (this instanceof ItemEntity) { | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Nassim Jahnke
				Nassim Jahnke