diff options
| author | Shane Freeder <[email protected]> | 2019-04-22 22:36:14 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-04-22 22:36:14 +0100 |
| commit | fb25dc17c62acce335346d5e96899257ae7230c7 (patch) | |
| tree | 44f004622c605490512882661faf912f2f98a85c /Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch | |
| parent | 10d58504f7d079381d1b0b189a1a8328a8e6ef51 (diff) | |
| download | Paper-fb25dc17c62acce335346d5e96899257ae7230c7.tar.gz Paper-fb25dc17c62acce335346d5e96899257ae7230c7.zip | |
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
0cef14e4 Remove draft API from selectEntities
CraftBukkit Changes:
a46fdbc6 Remove outdated build delay.
3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material
9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission
c3749a23 Remove the Damage tag from items when it is 0.
f74c7b95 SPIGOT-4706: Can't interact with active item
494eef45 Mention requirement of JIRA ticket for bug fixes
51d62dec SPIGOT-4702: Exception when middle clicking certain slots
be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
Diffstat (limited to 'Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch')
| -rw-r--r-- | Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch new file mode 100644 index 0000000000..580690ca5f --- /dev/null +++ b/Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch @@ -0,0 +1,21 @@ +From 4e97187ddd0422e3eaaea5715cae3db866f7c0f6 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath <[email protected]> +Date: Sun, 23 Sep 2018 20:59:53 -0500 +Subject: [PATCH] Honor EntityAgeable.ageLock + + +diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java +index 2af1ac7028..aa54e380e4 100644 +--- a/src/main/java/net/minecraft/server/EntityAgeable.java ++++ b/src/main/java/net/minecraft/server/EntityAgeable.java +@@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature { + } + + public void setAge(int i, boolean flag) { ++ if (ageLocked) return; // Paper - GH-1459 + int j = this.getAge(); + int k = j; + +-- +2.21.0 + |