diff options
| author | Shane Freeder <[email protected]> | 2020-09-19 12:29:53 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2020-09-19 12:29:53 +0100 |
| commit | 298c9022b03cc5f8ba2d1a0cc3cac860a9d5757b (patch) | |
| tree | 08e0c06fff09d6785d974c6c81ff5ed5f9152c0b /Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch | |
| parent | d946716973b4392028d693fc157214bc8dec4da7 (diff) | |
| download | Paper-298c9022b03cc5f8ba2d1a0cc3cac860a9d5757b.tar.gz Paper-298c9022b03cc5f8ba2d1a0cc3cac860a9d5757b.zip | |
Updated Upstream (Bukkit/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
Bukkit Changes:
ccb9614e #548: LivingEntity - add methods for getting/setting invisibility
CraftBukkit Changes:
f8d4da08 #743: LivingEntity - add methods for getting/setting invisibility
Spigot Changes:
17d78dbd 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 230325c1e1..daef3baee4 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 2c99bdfed76faedecf8121bd29b3fde4e883fb3a..62f1da9addcfb30ab23dce8c755dcc3e9951e202 100644 +index f5c760a8db6f509298f53df3538e7dd60f096b50..e720917159089e80dc8589ef7345644b44409c3d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1946,6 +1946,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1955,6 +1955,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } protected boolean addPassenger(Entity entity) { // CraftBukkit |