Merge remote-tracking branch 'origin/mobile-effects' into magicbox-1.5.2

This commit is contained in:
2023-09-03 07:33:50 -04:00
5 changed files with 83 additions and 23 deletions
@@ -1124,7 +1124,10 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
}
}
this.combatTarget = value;
}
public final ConcurrentHashMap<String, JobContainer> getTimers() {