Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Nullcheck getShopType()

This commit is contained in:
fullwall 2024-02-25 01:07:30 +08:00
parent 7f306216dc
commit 3c8429aa6d
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main/src/main/java/net/citizensnpcs/trait/ShopTrait.java
View File

@ -176,7 +176,7 @@ public class ShopTrait extends Trait {
} }
public ShopType getShopType() { public ShopType getShopType() {
return type; return type == null ? type = ShopType.DEFAULT : type;
} }
public String getTitle() { public String getTitle() {
@ -769,16 +769,19 @@ public class ShopTrait extends Trait {
@MenuSlot(slot = { 0, 8 }, material = Material.CHEST, amount = 1, title = "<f>Set shop type") @MenuSlot(slot = { 0, 8 }, material = Material.CHEST, amount = 1, title = "<f>Set shop type")
public void onSetInventoryType(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { public void onSetInventoryType(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
ctx.getMenu() ctx.getMenu().transition(InputMenus.picker("Set shop type",
.transition(InputMenus.picker("Set shop type", (Choice<ShopType> choice) -> shop.setShopType(choice.getValue()),
(Choice<ShopType> choice) -> shop.setShopType(choice.getValue()), Choice.of(ShopType.DEFAULT, Material.CHEST, "Default (5x9 chest)",
Choice.of(ShopType.DEFAULT, Material.CHEST, "Default (5x9 chest)", shop.getShopType() == ShopType.DEFAULT),
shop.type == ShopType.DEFAULT), Choice.of(ShopType.CHEST_4X9, Material.CHEST, "4x9 chest",
Choice.of(ShopType.CHEST_4X9, Material.CHEST, "4x9 chest", shop.type == ShopType.CHEST_4X9), shop.getShopType() == ShopType.CHEST_4X9),
Choice.of(ShopType.CHEST_3X9, Material.CHEST, "3x9 chest", shop.type == ShopType.CHEST_3X9), Choice.of(ShopType.CHEST_3X9, Material.CHEST, "3x9 chest",
Choice.of(ShopType.CHEST_2X9, Material.CHEST, "2x9 chest", shop.type == ShopType.CHEST_2X9), shop.getShopType() == ShopType.CHEST_3X9),
Choice.of(ShopType.CHEST_1X9, Material.CHEST, "1x9 chest", shop.type == ShopType.CHEST_1X9), Choice.of(ShopType.CHEST_2X9, Material.CHEST, "2x9 chest",
Choice.of(ShopType.TRADER, Material.EMERALD, "Trader", shop.type == ShopType.TRADER))); shop.getShopType() == ShopType.CHEST_2X9),
Choice.of(ShopType.CHEST_1X9, Material.CHEST, "1x9 chest",
shop.getShopType() == ShopType.CHEST_1X9),
Choice.of(ShopType.TRADER, Material.EMERALD, "Trader", shop.getShopType() == ShopType.TRADER)));
} }
@MenuSlot(slot = { 0, 4 }, material = Material.NAME_TAG, amount = 1) @MenuSlot(slot = { 0, 4 }, material = Material.NAME_TAG, amount = 1)
@ -916,7 +919,7 @@ public class ShopTrait extends Trait {
if (!evt.getView().equals(view)) if (!evt.getView().equals(view))
return; return;
evt.setCancelled(true); evt.setCancelled(true);
if (evt.getSlotType() != SlotType.RESULT) if (evt.getSlotType() != SlotType.RESULT || !evt.getAction().name().contains("PICKUP"))
return; return;
// TODO: work around crafting slot limitations in minecraft // TODO: work around crafting slot limitations in minecraft
player.getInventory().addItem(evt.getClickedInventory().getItem(0)); player.getInventory().addItem(evt.getClickedInventory().getItem(0));