forked from MagicBane/Server
revert new mob AI
This commit is contained in:
@@ -1465,12 +1465,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
if (eff == null)
|
||||
continue;
|
||||
|
||||
boolean cancelOnAttack = eff.cancelOnAttack();
|
||||
if(s.equals("Invisible"))
|
||||
cancelOnAttack = true;
|
||||
|
||||
|
||||
if (cancelOnAttack && eff.cancel()) {
|
||||
if (eff.cancelOnAttack() && eff.cancel()) {
|
||||
eff.cancelJob();
|
||||
this.effects.remove(s);
|
||||
changed = true;
|
||||
@@ -1565,10 +1560,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
override = true;
|
||||
}
|
||||
|
||||
Boolean cancelOnMove = eff.cancelOnMove();
|
||||
if(s.equals("SafeMode") || eff.getEffectsBase().getUUID() == 961)
|
||||
cancelOnMove = true;
|
||||
if (!override && cancelOnMove && eff.cancel()) {
|
||||
if (!override && eff.cancelOnMove() && eff.cancel()) {
|
||||
//System.out.println("canceling on Move");
|
||||
eff.cancelJob();
|
||||
this.effects.remove(s);
|
||||
|
||||
Reference in New Issue
Block a user