From a4dcd36d98f5f3a00f5201b777478de3bdf990ab Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:06:20 -0500 Subject: [PATCH] Ladders should not bypass cramming gamerule --- src/main/java/net/minecraft/server/Entity.java | 4 ++++ src/main/java/net/minecraft/server/EntityArmorStand.java | 2 +- src/main/java/net/minecraft/server/EntityBat.java | 2 +- src/main/java/net/minecraft/server/EntityBoat.java | 2 +- .../java/net/minecraft/server/EntityHorseAbstract.java | 2 +- src/main/java/net/minecraft/server/EntityLiving.java | 8 +++++--- .../java/net/minecraft/server/EntityMinecartAbstract.java | 2 +- src/main/java/net/minecraft/server/EntityParrot.java | 2 +- src/main/java/net/minecraft/server/IEntitySelector.java | 7 ++++++- src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ 10 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 36d11cfdf..dee92e5a7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1508,6 +1508,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean isCollidable() { + return isCollidable(false); + } + + public boolean isCollidable(boolean ignoreClimbing) { return false; } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java index e6032e3ed..fc4e12d9a 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -323,7 +323,7 @@ public class EntityArmorStand extends EntityLiving { } @Override - public boolean isCollidable() { + public boolean isCollidable(boolean ignoreClimbing) { // Purpur return false; } diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java index b19028fa8..56bdaf0e0 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -55,7 +55,7 @@ public class EntityBat extends EntityAmbient { } @Override - public boolean isCollidable() { + public boolean isCollidable(boolean ignoreClimbing) { // Purpur return false; } diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index 6a1d32df6..03624bbd6 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -98,7 +98,7 @@ public class EntityBoat extends Entity { } @Override - public boolean isCollidable() { + public boolean isCollidable(boolean ignoreClimbing) { // Purpur return true; } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java index 5cd46c747..c02d2afbe 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven } @Override - public boolean isCollidable() { + public boolean isCollidable(boolean ignoreClimbing) { // Purpur return !this.isVehicle(); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 7a5a1a2d3..758131649 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2673,7 +2673,7 @@ public abstract class EntityLiving extends Entity { protected void doTick() {} protected void collideNearby() { - List list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this)); + List list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this, net.pl3x.purpur.PurpurConfig.fixLaddersBypassingCrammingRule)); // Purpur if (!list.isEmpty()) { int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING); @@ -2811,8 +2811,10 @@ public abstract class EntityLiving extends Entity { } @Override - public boolean isCollidable() { - return this.isAlive() && !this.isClimbing() && this.collides; // CraftBukkit + // Purpur start + public boolean isCollidable(boolean ignoreClimbing) { + return this.isAlive() && (ignoreClimbing || !isClimbing()) && this.collides; // CraftBukkit + // Purpur end } @Override diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java index 5abd8a181..2aa8eb407 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -106,7 +106,7 @@ public abstract class EntityMinecartAbstract extends Entity { } @Override - public boolean isCollidable() { + public boolean isCollidable(boolean ignoreClimbing) { // Purpur return true; } diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java index 976b3c127..2aa12d83c 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -359,7 +359,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird { } @Override - public boolean isCollidable() { + public boolean isCollidable(boolean ignoreClimbing) { // Purpur return true; } diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java index a2d1ef360..8d7273a38 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -33,11 +33,16 @@ public final class IEntitySelector { } public static Predicate a(Entity entity) { + // Purpur start + return a(entity, false); + } + public static Predicate a(Entity entity, boolean ignoreClimbing) { + // Purpur end ScoreboardTeamBase scoreboardteambase = entity.getScoreboardTeam(); ScoreboardTeamBase.EnumTeamPush scoreboardteambase_enumteampush = scoreboardteambase == null ? ScoreboardTeamBase.EnumTeamPush.ALWAYS : scoreboardteambase.getCollisionRule(); return (Predicate) (scoreboardteambase_enumteampush == ScoreboardTeamBase.EnumTeamPush.NEVER ? Predicates.alwaysFalse() : IEntitySelector.f.and((entity1) -> { - if (!entity1.isCollidable()) { + if (!entity1.isCollidable(ignoreClimbing)) { // Purpur return false; } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index debf152bc..6c4fafaf7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -146,6 +146,11 @@ public class PurpurConfig { dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); } + public static boolean fixLaddersBypassingCrammingRule = true; + private static void fixLaddersBypassingCrammingRule() { + fixLaddersBypassingCrammingRule = getBoolean("settings.fix-ladders-bypassing-cramming-rule", fixLaddersBypassingCrammingRule); + } + public static boolean fixItemPositionDesync = false; private static void fixItemPositionDesync() { fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); -- 2.24.0.rc1