Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix potential NullPointerExceptions

This commit is contained in:
Phoenix616 2023-03-01 18:14:18 +01:00
parent a38f309453
commit 199573df59
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/Acrobot/ChestShop/Listeners/GarbageTextListener.java
View File

@ -16,15 +16,17 @@ public class GarbageTextListener implements Listener {
public static void filterGarbage(SignChangeEvent event) { public static void filterGarbage(SignChangeEvent event) {
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
String line = event.getLine(i); String line = event.getLine(i);
StringBuilder output = new StringBuilder(line.length()); if (line != null) {
StringBuilder output = new StringBuilder(line.length());
for (char character : line.toCharArray()) { for (char character : line.toCharArray()) {
if (character < 0xF700 || character > 0xF747) { if (character < 0xF700 || character > 0xF747) {
output.append(character); output.append(character);
}
} }
}
event.setLine(i, output.toString()); event.setLine(i, output.toString());
}
} }
} }
} }

4
src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EmptyShopDeleter.java
View File

@ -52,7 +52,9 @@ public class EmptyShopDeleter implements Listener {
sign.getBlock().setType(Material.AIR); sign.getBlock().setType(Material.AIR);
if (Properties.REMOVE_EMPTY_CHESTS && !ChestShopSign.isAdminShop(ownerInventory) && InventoryUtil.isEmpty(ownerInventory)) { if (Properties.REMOVE_EMPTY_CHESTS && !ChestShopSign.isAdminShop(ownerInventory) && InventoryUtil.isEmpty(ownerInventory)) {
connectedContainer.getBlock().setType(Material.AIR); if (connectedContainer != null) {
connectedContainer.getBlock().setType(Material.AIR);
}
} else { } else {
if (!signType.isItem()) { if (!signType.isItem()) {
try { try {

2
src/main/java/com/Acrobot/ChestShop/Utils/uBlock.java
View File

@ -221,7 +221,7 @@ public class uBlock {
Sign sign = (Sign) faceBlock.getState(); Sign sign = (Sign) faceBlock.getState();
Container signContainer = findConnectedContainer(sign); Container signContainer = findConnectedContainer(sign);
if (!chestBlock.equals(signContainer.getBlock())) { if (signContainer == null || !chestBlock.equals(signContainer.getBlock())) {
continue; continue;
} }