From 77229ce7ab7bd6cb7fb1af702202f7dbbe7d947e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 17:11:51 +0000 Subject: [PATCH] Add OBFHELPER - InventoryEnderChest#getTileEntity --- ...e-event-to-allow-plugins-to-handle-clien.patch | 4 ++-- ...-getting-location-from-players-EnderChes.patch | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 3026dacaa8..9c256ccbc3 100644 --- a/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From 3bac91384f39b6a374f2c3a1ef2a9622e78fc40b Mon Sep 17 00:00:00 2001 +From c2d3f644f72d2928e2196f19aedcebf30669b505 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:20:18 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -223,5 +223,5 @@ index 00000000..e44d03a2 + } +} -- -2.13.2 +2.16.2 diff --git a/Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-players-EnderChes.patch b/Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-players-EnderChes.patch index 00ff993da9..ce7df1952b 100644 --- a/Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-players-EnderChes.patch +++ b/Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-players-EnderChes.patch @@ -1,18 +1,27 @@ -From f8b50e2741cee621d2812279b607ae395fe93e75 Mon Sep 17 00:00:00 2001 +From ef57c5ff0c40fb3c195d1fb50ea6a887a6eeb81c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from players EnderChest diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index cd7de2b53..3bd69bf86 100644 +index cd7de2b53..85ad93d08 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java +@@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder; + + public class InventoryEnderChest extends InventorySubcontainer { + +- private TileEntityEnderChest a; ++ private TileEntityEnderChest a; public TileEntityEnderChest getTileEntity() { return a; } // Paper - OBFHELPER + // CraftBukkit start + private final EntityHuman owner; + @@ -15,6 +15,7 @@ public class InventoryEnderChest extends InventorySubcontainer { @Override public Location getLocation() { -+ if (a == null) return owner.getBukkitEntity().getLocation(); // Paper - return Player location if there is no TE ++ if (getTileEntity() == null) return owner.getBukkitEntity().getLocation(); // Paper - return Player location if there is no TE return new Location(this.a.getWorld().getWorld(), this.a.getPosition().getX(), this.a.getPosition().getY(), this.a.getPosition().getZ()); }