Merge pull request #1254
0fbf3e77
Re-add Option to prevent armor stands from doing entity lookups (Hugo Manrique)
* pull/1254/head:
Re-add Option to prevent armor stands from doing entity lookups
This commit is contained in:
commit
3ad50727b9
3 changed files with 53 additions and 36 deletions
|
@ -1,35 +0,0 @@
|
|||
From a3aaaa3233ac457ef6bc4c1373429c28bc66524a Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Wed, 21 Dec 2016 11:52:04 -0600
|
||||
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 2ba3bcb8e..5f06d4e5e 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -408,4 +408,9 @@ public class PaperWorldConfig {
|
||||
log("Treasure Maps will return already discovered locations");
|
||||
}
|
||||
}
|
||||
+
|
||||
+ public boolean armorStandEntityLookups = true;
|
||||
+ private void armorStandEntityLookups() {
|
||||
+ armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 424b956e8..b85c55168 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess {
|
||||
|
||||
this.a(entity, axisalignedbb, false, arraylist);
|
||||
if (entity != null) {
|
||||
+ if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return arraylist; // Paper
|
||||
List list = this.getEntities(entity, axisalignedbb.g(0.25D));
|
||||
|
||||
for (int i = 0; i < list.size(); ++i) {
|
||||
--
|
||||
2.18.0
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue