diff options
| author | Aikar <[email protected]> | 2020-08-26 04:46:59 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-08-26 04:46:59 -0400 |
| commit | 20fc1b5c2a28ffdf4e4601f82ec611b2213b09d7 (patch) | |
| tree | 15edf81d7080e20fe2936483ddd0f4faa7d91b0e /Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch | |
| parent | 655258b3398a313fad19d627819723ee2912c378 (diff) | |
| download | Paper-20fc1b5c2a28ffdf4e4601f82ec611b2213b09d7.tar.gz Paper-20fc1b5c2a28ffdf4e4601f82ec611b2213b09d7.zip | |
[Auto] Updated Upstream (CraftBukkit/Spigot)
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
CraftBukkit Changes:
049120068 SPIGOT-6101: Store persist state of entities
0de8365dd SPIGOT-6103: Summoning an Eye of Ender throw an Error
Spigot Changes:
b5a13e6d Rebuild patches
Diffstat (limited to 'Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch')
| -rw-r--r-- | Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch index 119f6c7238..16783a486f 100644 --- a/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 17cc2b686e33c6de0ab9db6aa7cbc56dac6abcdf..df77b4e6d5fb3e0ff795ae36402b4c902a613225 100644 +index 3b3b443cd25ef5c327f54c5e784e03bd81c73a7a..55b4c8abeb0033b15a255ec36e1998678d836dd2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1945,6 +1945,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1949,6 +1949,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } protected boolean addPassenger(Entity entity) { // CraftBukkit |