diff --git a/patches/server/0043-Ladders-should-not-bypass-cramming-gamerule.patch b/patches/server/0043-Ladders-should-not-bypass-cramming-gamerule.patch index bb7b8394b..ae37963bd 100644 --- a/patches/server/0043-Ladders-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0043-Ladders-should-not-bypass-cramming-gamerule.patch @@ -1,4 +1,4 @@ -From 205bdc6ed4cdfc2e6e2a55eb9f841fc7da58c697 Mon Sep 17 00:00:00 2001 +From 2611b16865eef20db3a3fe08fcd6e7490ac1e892 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 @@ -13,7 +13,8 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule .../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 ++++++- - 9 files changed, 21 insertions(+), 10 deletions(-) + 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 26a30e1c..770d2146 100644 @@ -83,7 +84,7 @@ index 2177a437..05a5169c 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index aa60c008..84aebb91 100644 +index aa60c008..14972386 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2609,7 +2609,7 @@ public abstract class EntityLiving extends Entity { @@ -91,7 +92,7 @@ index aa60c008..84aebb91 100644 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, true)); // Purpur ++ 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); @@ -156,6 +157,22 @@ index 56488b78..7ef7fe22 100644 return false; } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).dG())) { return false; +diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +index f8a35064..f589f0e8 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.20.1 diff --git a/patches/server/0047-Implement-configurable-villager-brain-ticks.patch b/patches/server/0047-Implement-configurable-villager-brain-ticks.patch index 7b593ade2..a3d05dd6a 100644 --- a/patches/server/0047-Implement-configurable-villager-brain-ticks.patch +++ b/patches/server/0047-Implement-configurable-villager-brain-ticks.patch @@ -1,4 +1,4 @@ -From d033efb623d1a13c9a55617ae3cc454b8919feb7 Mon Sep 17 00:00:00 2001 +From c58aa474b6071749ee9d4136d89d8f6cae5f796e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 08:28:21 -0500 Subject: [PATCH] Implement configurable villager brain ticks @@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks 2 files changed, 13 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 70e8a422a..da3fb4b57 100644 +index 70e8a422..da3fb4b5 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -40,10 +40,10 @@ index 70e8a422a..da3fb4b57 100644 this.world.getMethodProfiler().exit(); if (!this.dY() && this.bE > 0) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6d531306e..29c656c59 100644 +index d48f9371..a676746d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -214,6 +214,13 @@ public class PurpurConfig { +@@ -219,6 +219,13 @@ public class PurpurConfig { snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack); } diff --git a/patches/server/0049-Add-option-to-disable-pillager-patrols.patch b/patches/server/0049-Add-option-to-disable-pillager-patrols.patch index 60bba45aa..2c6e067e9 100644 --- a/patches/server/0049-Add-option-to-disable-pillager-patrols.patch +++ b/patches/server/0049-Add-option-to-disable-pillager-patrols.patch @@ -1,4 +1,4 @@ -From dc61bb558c3e0895bdaa05b9b998e2319e3e3bfe Mon Sep 17 00:00:00 2001 +From 584f4f7caa9c9482035da97da63ccd6a575508dc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 27 Jul 2019 17:20:35 -0500 Subject: [PATCH] Add option to disable pillager patrols @@ -9,7 +9,7 @@ Subject: [PATCH] Add option to disable pillager patrols 2 files changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index bb612b386..99bb38f03 100644 +index bb612b38..99bb38f0 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java @@ -9,6 +9,7 @@ public class MobSpawnerPatrol { @@ -21,10 +21,10 @@ index bb612b386..99bb38f03 100644 return 0; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 29c656c59..704142198 100644 +index a676746d..01c9d086 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -207,6 +207,11 @@ public class PurpurConfig { +@@ -212,6 +212,11 @@ public class PurpurConfig { pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit); }