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

Don't add potioneffect when watcher already has a potion effect. Don't compare the length of custom name. But check if its null

Browse Source
This commit is contained in:
libraryaddict 2014-07-03 18:34:06 +12:00
parent aed3bbddf4
commit 8f2c5d6e54
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java
View File

@ -53,11 +53,12 @@ public class LivingWatcher extends FlagWatcher {
} }
public void addPotionEffect(PotionEffectType potionEffect) { public void addPotionEffect(PotionEffectType potionEffect) {
if (hasPotionEffect(potionEffect)) if (!hasPotionEffect(potionEffect)) {
removePotionEffect(potionEffect); removePotionEffect(potionEffect);
potionEffects.add(potionEffect.getId()); potionEffects.add(potionEffect.getId());
sendPotionEffects(); sendPotionEffects();
} }
}
@Override @Override
public LivingWatcher clone(Disguise disguise) { public LivingWatcher clone(Disguise disguise) {
@ -115,7 +116,7 @@ public class LivingWatcher extends FlagWatcher {
} }
public boolean hasCustomName() { public boolean hasCustomName() {
return getCustomName().length() > 0; return getCustomName() != null;
} }
public boolean hasPotionEffect(PotionEffectType type) { public boolean hasPotionEffect(PotionEffectType type) {
@ -148,8 +149,9 @@ public class LivingWatcher extends FlagWatcher {
} }
public void setCustomName(String name) { public void setCustomName(String name) {
if (name != null && name.length() > 64) if (name != null && name.length() > 64) {
name = name.substring(0, 64); name = name.substring(0, 64);
}
setValue(10, name); setValue(10, name);
sendData(10); sendData(10);
} }