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

SPIGOT-6111: NPE in CraftHumanEntity#openWorkbench & CraftHumanEntity#openEnchanting

Browse source
This commit is contained in:
md_5 2020-08-27 18:32:52 +10:00
parent ee7116b4cc
commit bfea455968
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View file

@ -326,15 +326,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override @Override
public InventoryView openWorkbench(Location location, boolean force) { public InventoryView openWorkbench(Location location, boolean force) {
if (location == null) {
location = getLocation();
}
if (!force) { if (!force) {
Block block = location.getBlock(); Block block = location.getBlock();
if (block.getType() != Material.CRAFTING_TABLE) { if (block.getType() != Material.CRAFTING_TABLE) {
return null; return null;
} }
} }
if (location == null) {
location = getLocation();
}
getHandle().openContainer(((BlockWorkbench) Blocks.CRAFTING_TABLE).getInventory(null, getHandle().world, new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()))); getHandle().openContainer(((BlockWorkbench) Blocks.CRAFTING_TABLE).getInventory(null, getHandle().world, new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ())));
if (force) { if (force) {
getHandle().activeContainer.checkReachable = false; getHandle().activeContainer.checkReachable = false;
@ -344,15 +344,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override @Override
public InventoryView openEnchanting(Location location, boolean force) { public InventoryView openEnchanting(Location location, boolean force) {
if (location == null) {
location = getLocation();
}
if (!force) { if (!force) {
Block block = location.getBlock(); Block block = location.getBlock();
if (block.getType() != Material.ENCHANTING_TABLE) { if (block.getType() != Material.ENCHANTING_TABLE) {
return null; return null;
} }
} }
if (location == null) {
location = getLocation();
}
// If there isn't an enchant table we can force create one, won't be very useful though. // If there isn't an enchant table we can force create one, won't be very useful though.
BlockPosition pos = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); BlockPosition pos = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ());