Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix armorstand entity lookups paper.yml setting not being used

Browse Source
This commit is contained in:
William Blake Galbreath
2020-07-04 19:20:50 -05:00
parent 72211ef893
commit f0c2a7a809
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
patches/server/0103-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch Normal file
View File

@@ -0,0 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Jul 2020 19:19:13 -0500
Subject: [PATCH] Fix armorstand entity lookups paper.yml setting not being
used
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index fd31212e0b..14eadf64e7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -974,13 +974,6 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
MinecraftServer.getServer().executeMidTickTasks(); // Tuinity - execute chunk tasks mid tick
}
- // Paper start - Prevent armor stands from doing entity lookups
- @Override
- public boolean getCubes(@Nullable Entity entity, AxisAlignedBB axisAlignedBB) {
- if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return false;
- return GeneratorAccess.super.getCubes(entity, axisAlignedBB);
- }
- // Paper end
public Explosion explode(@Nullable Entity entity, double d0, double d1, double d2, float f, Explosion.Effect explosion_effect) {
return this.createExplosion(entity, (DamageSource) null, (ExplosionDamageCalculator) null, d0, d1, d2, f, false, explosion_effect);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 918a82d466..39107b067c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -688,6 +688,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@Override
public boolean getCubes(@Nullable Entity entity, AxisAlignedBB axisalignedbb) {
+ if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return false; // Paper // Purpur - moved from World
return !this.hasAnyCollisions(entity, axisalignedbb);
}