From f14146a5754944084a849cd138f0e820c8930ecc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 11:36:30 -0500 Subject: [PATCH] Fix and rename climbing bypass cramming patch --- ...-should-not-bypass-cramming-gamerule.patch} | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) rename patches/server/{0057-Ladders-should-not-bypass-cramming-gamerule.patch => 0057-Climbing-should-not-bypass-cramming-gamerule.patch} (90%) diff --git a/patches/server/0057-Ladders-should-not-bypass-cramming-gamerule.patch b/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 90% rename from patches/server/0057-Ladders-should-not-bypass-cramming-gamerule.patch rename to patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch index ee669e7ed..4cf8bf5dd 100644 --- a/patches/server/0057-Ladders-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch @@ -1,7 +1,7 @@ -From 469f78d5ce5d5d777fcdea6f087d2622aa3b6497 Mon Sep 17 00:00:00 2001 +From 91ba7d94e9bdd9c215845d3eb8ab4eb3d3edc64f 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 +Subject: [PATCH] Climbing should not bypass cramming gamerule --- src/main/java/net/minecraft/server/Entity.java | 6 ++++++ @@ -12,9 +12,9 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule 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 | 6 ++++++ + src/main/java/net/minecraft/server/IEntitySelector.java | 8 +++++++- src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 10 files changed, 25 insertions(+), 9 deletions(-) + 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 c037657ab1..bbe5a66398 100644 @@ -138,10 +138,10 @@ index 7ba2f3a351..dd2cd7b219 100644 } diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 4665671ef6..037f14e010 100644 +index 4665671ef6..fbf2a50f08 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java -@@ -36,6 +36,12 @@ public final class IEntitySelector { +@@ -36,11 +36,17 @@ public final class IEntitySelector { } public static Predicate a(Entity entity) { @@ -154,6 +154,12 @@ index 4665671ef6..037f14e010 100644 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)) { + return false; + } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) { + return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index acb5a9f109..551327db8f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java