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

Remove zombie-specific profession from VillagerProfession

Browse Source
This commit is contained in:
fullwall 2016-08-19 21:49:28 +08:00
parent 73854b8107
commit d9f31ffc84
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
View File

@ -20,6 +20,9 @@ public class VillagerProfession extends Trait {
public void load(DataKey key) throws NPCLoadException {
try {
profession = Profession.valueOf(key.getString(""));
if (profession == Profession.NORMAL) {
profession = Profession.FARMER;
}
} catch (IllegalArgumentException ex) {
throw new NPCLoadException("Invalid profession.");
}
@ -27,8 +30,9 @@ public class VillagerProfession extends Trait {
@Override
public void onSpawn() {
if (npc.getEntity() instanceof Villager)
if (npc.getEntity() instanceof Villager) {
((Villager) npc.getEntity()).setProfession(profession);
}
}
@Override
@ -37,9 +41,13 @@ public class VillagerProfession extends Trait {
}
public void setProfession(Profession profession) {
if (profession == Profession.NORMAL) {
profession = Profession.FARMER;
}
this.profession = profession;
if (npc.getEntity() instanceof Villager)
if (npc.getEntity() instanceof Villager) {
((Villager) npc.getEntity()).setProfession(profession);
}
}
@Override