diff options
Diffstat (limited to 'Spigot-Server-Patches/0151-Add-option-to-make-parrots-stay-on-shoulders-despite.patch')
| -rw-r--r-- | Spigot-Server-Patches/0151-Add-option-to-make-parrots-stay-on-shoulders-despite.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Spigot-Server-Patches/0151-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0151-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 1a1bf27225..bfb46bd743 100644 --- a/Spigot-Server-Patches/0151-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0151-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 4b69c61b46470062ee37c9f54bc6ae98e6759489 Mon Sep 17 00:00:00 2001 +From 4e20ea037a039e8799ae11a8767bb7eb482b6865 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement @@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release. To be converted into a Paper-API event at some point in the future? diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index de8362ddd7..54d6799442 100644 +index 2d01984f0..42c4a9445 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -321,4 +321,10 @@ public class PaperWorldConfig { +@@ -326,4 +326,10 @@ public class PaperWorldConfig { maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); log( "Max Entity Collisions: " + maxCollisionsPerEntity ); } @@ -26,7 +26,7 @@ index de8362ddd7..54d6799442 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 87d3337c88..1efec35941 100644 +index 4ceac0a2f..c162c6b73 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -451,7 +451,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -39,7 +39,7 @@ index 87d3337c88..1efec35941 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 068827e2ea..579c551f95 100644 +index 068827e2e..579c551f9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1756,6 +1756,13 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -57,5 +57,5 @@ index 068827e2ea..579c551f95 100644 case STOP_SNEAKING: this.player.setSneaking(false); -- -2.22.0 +2.23.0 |