2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								From: Hugo Manrique <hugmanrique@gmail.com>
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								Date: Mon, 23 Jul 2018 12:57:39 +0200
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								Subject: [PATCH] Option to prevent armor stands from doing entity lookups
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
  
						 
					
						
							
								
									
										
										
										
											2024-01-21 19:37:09 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								index d04d0b9cbf91beb57da7e37e72f8e7c98cf6cf4c..e6e3a7ae08f7346ccbce02b9d36239485133e93a 100644
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
  
						 
					
						
							
								
									
										
										
										
											2023-03-14 19:59:51 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -337,6 +337,7 @@ public class ArmorStand extends LivingEntity {
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     @Override
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     protected void pushEntities() {
							 
						 
					
						
							
								
									
										
										
										
											2024-01-21 19:37:09 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+        if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper - Option to prevent armor stands from doing entity lookups
  
						 
					
						
							
								
									
										
										
										
											2023-06-07 22:19:14 +02:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								         List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS);
							 
						 
					
						
							
								
									
										
										
										
											2023-09-21 15:01:00 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								         Iterator iterator = list.iterator();
							 
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
  
						 
					
						
							
								
									
										
										
										
											2024-01-24 13:07:40 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								index 19d6a829edb977d064c5d5a42ae3cab4fc806bb6..0ead21982ff57ba748eb6b4169e9e1a8c32bf34e 100644
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								--- a/src/main/java/net/minecraft/world/level/Level.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/src/main/java/net/minecraft/world/level/Level.java
  
						 
					
						
							
								
									
										
										
										
											2024-01-24 13:07:40 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -772,6 +772,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
						 
					
						
							
								
									
										
										
										
											2024-01-24 11:45:17 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								             // Paper end - Prevent block entity and entity crashes
							 
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								         }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     }
							 
						 
					
						
							
								
									
										
										
										
											2024-01-21 19:37:09 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+    // Paper start - Option to prevent armor stands from doing entity lookups
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+    @Override
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    public boolean noCollision(@Nullable Entity entity, AABB box) {
  
						 
					
						
							
								
									
										
										
										
											2023-06-07 14:46:56 -07:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+        if (entity instanceof net.minecraft.world.entity.decoration.ArmorStand && !entity.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return false;
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+        return LevelAccessor.super.noCollision(entity, box);
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+    }
  
						 
					
						
							
								
									
										
										
										
											2024-01-21 19:37:09 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+    // Paper end - Option to prevent armor stands from doing entity lookups
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2021-11-23 16:04:41 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								     public boolean shouldTickDeath(Entity entity) {
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								         return true;