core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add OBFHELPER - InventoryEnderChest#getTileEntity

This commit is contained in:
Shane Freeder 2018-03-10 17:11:51 +00:00
parent 9daa9cec93
commit 77229ce7ab
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
View File

@ -1,4 +1,4 @@
From 3bac91384f39b6a374f2c3a1ef2a9622e78fc40b Mon Sep 17 00:00:00 2001 From c2d3f644f72d2928e2196f19aedcebf30669b505 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Wed, 13 Apr 2016 20:20:18 -0700 Date: Wed, 13 Apr 2016 20:20:18 -0700
Subject: [PATCH] Add handshake event to allow plugins to handle client Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -223,5 +223,5 @@ index 00000000..e44d03a2
+ } + }
+} +}
-- --
2.13.2 2.16.2

15
Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-players-EnderChes.patch
View File

@ -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 <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 10 Mar 2018 13:03:49 +0000 Date: Sat, 10 Mar 2018 13:03:49 +0000
Subject: [PATCH] Fix NPE when getting location from players EnderChest 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 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 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
+++ b/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 { @@ -15,6 +15,7 @@ public class InventoryEnderChest extends InventorySubcontainer {
@Override @Override
public Location getLocation() { 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()); return new Location(this.a.getWorld().getWorld(), this.a.getPosition().getX(), this.a.getPosition().getY(), this.a.getPosition().getZ());
} }