mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2024-09-26 06:13:09 +02:00
Fix null check in age
This commit is contained in:
parent
2e2a83779e
commit
138aaacbcf
@ -10,7 +10,7 @@ import org.bukkit.inventory.ItemStack;
|
|||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
|
|
||||||
import net.citizensnpcs.api.gui.CitizensInventoryClickEvent;
|
import net.citizensnpcs.api.gui.CitizensInventoryClickEvent;
|
||||||
import net.citizensnpcs.api.gui.InputMenu;
|
import net.citizensnpcs.api.gui.InputMenus;
|
||||||
import net.citizensnpcs.api.gui.InventoryMenuPage;
|
import net.citizensnpcs.api.gui.InventoryMenuPage;
|
||||||
import net.citizensnpcs.api.gui.InventoryMenuSlot;
|
import net.citizensnpcs.api.gui.InventoryMenuSlot;
|
||||||
import net.citizensnpcs.api.gui.Menu;
|
import net.citizensnpcs.api.gui.Menu;
|
||||||
@ -72,8 +72,8 @@ public class NPCConfigurator extends InventoryMenuPage {
|
|||||||
SLOT_MAP.put(0, new ConfiguratorInfo(Util.getFallbackMaterial("OAK_SIGN", "SIGN"), (evt) -> {
|
SLOT_MAP.put(0, new ConfiguratorInfo(Util.getFallbackMaterial("OAK_SIGN", "SIGN"), (evt) -> {
|
||||||
evt.slot.setDescription("Edit NPC name\n" + evt.npc.getName());
|
evt.slot.setDescription("Edit NPC name\n" + evt.npc.getName());
|
||||||
if (evt.event != null) {
|
if (evt.event != null) {
|
||||||
evt.ctx.getMenu()
|
evt.ctx.getMenu().transition(
|
||||||
.transition(InputMenu.setter(() -> evt.npc.getName(), (input) -> evt.npc.setName(input)));
|
InputMenus.stringSetter(() -> evt.npc.getName(), (input) -> evt.npc.setName(input)));
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ public class Age extends Trait implements Toggleable {
|
|||||||
} else if (npc.getEntity() instanceof Zombie) {
|
} else if (npc.getEntity() instanceof Zombie) {
|
||||||
((Zombie) npc.getEntity()).setBaby(age < 0);
|
((Zombie) npc.getEntity()).setBaby(age < 0);
|
||||||
ageable = null;
|
ageable = null;
|
||||||
} else if (npc.getEntity().getType().name().equals("TADPOLE")) {
|
} else if (npc.isSpawned() && npc.getEntity().getType().name().equals("TADPOLE")) {
|
||||||
((Tadpole) npc.getEntity()).setAge(age);
|
((Tadpole) npc.getEntity()).setAge(age);
|
||||||
ageable = null;
|
ageable = null;
|
||||||
} else {
|
} else {
|
||||||
|
@ -13,7 +13,8 @@ import com.google.common.collect.Maps;
|
|||||||
|
|
||||||
import net.citizensnpcs.api.gui.CitizensInventoryClickEvent;
|
import net.citizensnpcs.api.gui.CitizensInventoryClickEvent;
|
||||||
import net.citizensnpcs.api.gui.ClickHandler;
|
import net.citizensnpcs.api.gui.ClickHandler;
|
||||||
import net.citizensnpcs.api.gui.InputMenu;
|
import net.citizensnpcs.api.gui.InputMenus;
|
||||||
|
import net.citizensnpcs.api.gui.InputMenus.Choice;
|
||||||
import net.citizensnpcs.api.gui.InventoryMenu;
|
import net.citizensnpcs.api.gui.InventoryMenu;
|
||||||
import net.citizensnpcs.api.gui.InventoryMenuPage;
|
import net.citizensnpcs.api.gui.InventoryMenuPage;
|
||||||
import net.citizensnpcs.api.gui.InventoryMenuSlot;
|
import net.citizensnpcs.api.gui.InventoryMenuSlot;
|
||||||
@ -49,7 +50,7 @@ public class ShopTrait extends Trait {
|
|||||||
@Persist
|
@Persist
|
||||||
private String requiredPermission;
|
private String requiredPermission;
|
||||||
@Persist
|
@Persist
|
||||||
private final ShopType type = ShopType.VIEW;
|
private ShopType type = ShopType.VIEW;
|
||||||
|
|
||||||
private NPCShop(String name) {
|
private NPCShop(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
@ -99,13 +100,19 @@ public class ShopTrait extends Trait {
|
|||||||
@ClickHandler(slot = { 0, 2 })
|
@ClickHandler(slot = { 0, 2 })
|
||||||
public void onPermissionChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
|
public void onPermissionChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
ctx.getMenu()
|
ctx.getMenu().transition(
|
||||||
.transition(InputMenu.setter(() -> shop.getRequiredPermission(), (p) -> shop.setPermission(p)));
|
InputMenus.stringSetter(() -> shop.getRequiredPermission(), (p) -> shop.setPermission(p)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ClickHandler(slot = { 0, 0 })
|
@ClickHandler(slot = { 0, 0 })
|
||||||
public void onShopTypeChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
|
public void onShopTypeChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
ctx.getMenu().transition(InputMenus.<ShopType> picker("Edit shop type", (chosen) -> {
|
||||||
|
shop.type = chosen.getValue();
|
||||||
|
}, Choice.of(ShopType.BUY, Material.DIAMOND, "Players buy items", shop.type == ShopType.BUY),
|
||||||
|
Choice.of(ShopType.SELL, Material.EMERALD, "Players sell items", shop.type == ShopType.SELL),
|
||||||
|
Choice.of(ShopType.VIEW, Material.ENDER_EYE, "Players view items only",
|
||||||
|
shop.type == ShopType.VIEW)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user