OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 00:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Return null instead of players location on EnderChests opened by plugins

Browse source
This commit is contained in:
Shane Freeder 2018-03-10 20:26:05 +00:00
parent 77229ce7ab
commit ddc8a0ae88
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-players-EnderChes.patch → Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
View file

@ -1,11 +1,12 @@
From ef57c5ff0c40fb3c195d1fb50ea6a887a6eeb81c Mon Sep 17 00:00:00 2001 From 4caec43af620f7c53787870fd105694be881b5d2 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 InventoryEnderChest opened
by plugins
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..85ad93d08 100644 index cd7de2b53..37b494b78 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; @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
@ -21,7 +22,7 @@ index cd7de2b53..85ad93d08 100644
@Override @Override
public Location getLocation() { public Location getLocation() {
+ if (getTileEntity() == null) return owner.getBukkitEntity().getLocation(); // Paper - return Player location if there is no TE + if (getTileEntity() == null) return null; // Paper - return null if there is no TE bound (opened by plugin)
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());
} }