Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 12:30:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2020-08-27 18:32:52 +10:00
Ursprung ee7116b4cc
Commit bfea455968
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: E8E901AC7C617C11
1 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

12
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
Datei anzeigen

@ -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());