infinite loop fix

2023-08-08 13:36:46 -05:00
parent e88e8b56c6
commit 923447e983
4 changed files with 28 additions and 24 deletions
@@ -1162,20 +1162,20 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
    }

    public final void setCombatTarget(final AbstractWorldObject value) {
-        if(value.getObjectTypeMask() == MBServerStatics.MASK_MOB) {
+        if(this.getObjectTypeMask() == 2050) {//MOB?
            if (value == null) {
                if (this.isCombat()) {
                    this.setCombat(false);
                    UpdateStateMsg rwss = new UpdateStateMsg();
                    rwss.setPlayer(this);
                    DispatchMessage.sendToAllInRange(this, rwss);
-                } else {
-                    if (!this.isCombat()) {
-                        this.setCombat(true);
-                        UpdateStateMsg rwss = new UpdateStateMsg();
-                        rwss.setPlayer(this);
-                        DispatchMessage.sendToAllInRange(this, rwss);
-                    }
+                }
+                }else {
+                if (!this.isCombat()) {
+                    this.setCombat(true);
+                    UpdateStateMsg rwss = new UpdateStateMsg();
+                    rwss.setPlayer(this);
+                    DispatchMessage.sendToAllInRange(this, rwss);
                }
            }
        }