Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 11:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Temporary hack to fix age throwing errors, don't give every NPC age on create

Browse Source
This commit is contained in:
fullwall 2012-05-17 23:31:09 +08:00
parent 434bc6168b
commit 4698e70f77
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/citizensnpcs/command/command/NPCCommands.java
View File

@ -204,7 +204,8 @@ public class NPCCommands {
npc.spawn(player.getLocation()); npc.spawn(player.getLocation());
// Set age after entity spawns // Set age after entity spawns
npc.getTrait(Age.class).setAge(age); if (npc.getBukkitEntity() instanceof Ageable)
npc.getTrait(Age.class).setAge(age);
selector.select(player, npc); selector.select(player, npc);
Messaging.send(player, msg); Messaging.send(player, msg);

19
src/main/java/net/citizensnpcs/trait/Age.java
View File

@ -10,6 +10,7 @@ import org.bukkit.entity.Ageable;
public class Age extends Trait implements Runnable, Toggleable { public class Age extends Trait implements Runnable, Toggleable {
private int age = 0; private int age = 0;
private boolean locked = true; private boolean locked = true;
private boolean ageable = false;
private final NPC npc; private final NPC npc;
public Age(NPC npc) { public Age(NPC npc) {
@ -26,14 +27,18 @@ public class Age extends Trait implements Runnable, Toggleable {
@Override @Override
public void onNPCSpawn() { public void onNPCSpawn() {
Ageable entity = (Ageable) npc.getBukkitEntity(); if (npc instanceof Ageable) {
entity.setAge(age); Ageable entity = (Ageable) npc.getBukkitEntity();
entity.setAgeLock(locked); entity.setAge(age);
entity.setAgeLock(locked);
ageable = true;
} else
ageable = false;
} }
@Override @Override
public void run() { public void run() {
if (!locked) if (!locked && ageable)
age = ((Ageable) npc.getBukkitEntity()).getAge(); age = ((Ageable) npc.getBukkitEntity()).getAge();
} }
@ -45,13 +50,15 @@ public class Age extends Trait implements Runnable, Toggleable {
public void setAge(int age) { public void setAge(int age) {
this.age = age; this.age = age;
((Ageable) npc.getBukkitEntity()).setAge(age); if (ageable)
((Ageable) npc.getBukkitEntity()).setAge(age);
} }
@Override @Override
public boolean toggle() { public boolean toggle() {
locked = !locked; locked = !locked;
((Ageable) npc.getBukkitEntity()).setAgeLock(locked); if (ageable)
((Ageable) npc.getBukkitEntity()).setAgeLock(locked);
return locked; return locked;
} }