SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix zombie villager watcher

Browse Source
This commit is contained in:
libraryaddict 2017-12-14 01:53:48 +13:00
parent cc06600a0b
commit ed52576277
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java
View File

@ -1,9 +1,8 @@
package me.libraryaddict.disguise.disguisetypes.watchers; package me.libraryaddict.disguise.disguisetypes.watchers;
import org.bukkit.entity.Villager.Profession;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.disguisetypes.MetaIndex;
import org.bukkit.entity.Villager.Profession;
public class ZombieVillagerWatcher extends ZombieWatcher { public class ZombieVillagerWatcher extends ZombieWatcher {
@ -17,7 +16,7 @@ public class ZombieVillagerWatcher extends ZombieWatcher {
/** /**
* Is this zombie a villager? * Is this zombie a villager?
* *
* @return * @return
*/ */
public boolean isVillager() { public boolean isVillager() {
@ -31,32 +30,35 @@ public class ZombieVillagerWatcher extends ZombieWatcher {
/** /**
* Only returns a valid value if this zombie is a villager. * Only returns a valid value if this zombie is a villager.
* *
* @return * @return
*/ */
public Profession getProfession() { public Profession getProfession() {
return Profession.values()[getData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION)]; int ord = getData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION);
if (ord == 1)
return Profession.HUSK;
return Profession.NORMAL;
} }
/** /**
* Sets the profession of this zombie, in turn turning it into a Zombie Villager * Sets the profession of this zombie, in turn turning it into a Zombie Villager
* *
* @param id * @param id
*/ */
@Deprecated @Deprecated
public void setProfession(int id) { public void setProfession(int id) {
setData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION, id); setData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION, id % 2);
sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION); sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION);
} }
/** /**
* Sets the profession of this zombie, in turn turning it into a Zombie Villager * Sets the profession of this zombie, in turn turning it into a Zombie Villager
* *
* @param profession * @param profession
*/ */
public void setProfession(Profession profession) { public void setProfession(Profession profession) {
setData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION, profession.ordinal()); setProfession(profession.ordinal());
sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION);
} }
} }