forked from MagicBane/Server
mob resist issue
This commit is contained in:
@@ -678,13 +678,8 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
}
|
||||
|
||||
public final Resists getResists() {
|
||||
if (this.resists == null)
|
||||
if (this.resists == null && !this.getObjectType().equals(GameObjectType.Mob))
|
||||
return Resists.getResists(0);
|
||||
if(Mob.disciplineDroppers.contains(this)){
|
||||
return new Resists("Dropper");
|
||||
}
|
||||
if(this.getObjectType().equals(GameObjectType.Mob) && ((Mob)this).behaviourType.equals(MobBehaviourType.HamletGuard))
|
||||
return new Resists("HamletGuard");
|
||||
|
||||
return this.resists;
|
||||
}
|
||||
|
||||
@@ -161,6 +161,8 @@ public class Mob extends AbstractIntelligenceAgent {
|
||||
|
||||
this.agentType = AIAgentType.MOBILE;
|
||||
|
||||
this.setResists(Resists.getResists(rs.getInt("mob_spawnType")));
|
||||
|
||||
} catch (Exception e) {
|
||||
Logger.error(e + " " + this.dbID);
|
||||
}
|
||||
@@ -1083,8 +1085,6 @@ public class Mob extends AbstractIntelligenceAgent {
|
||||
} catch (Exception e) {
|
||||
Logger.error(e.getMessage());
|
||||
}
|
||||
if(this.dropper == false)
|
||||
Resists.calculateResists(this);
|
||||
}
|
||||
|
||||
public void calculateMaxHealthManaStamina() {
|
||||
@@ -1753,7 +1753,6 @@ public class Mob extends AbstractIntelligenceAgent {
|
||||
|
||||
if(this.dropper){
|
||||
this.level = 65;
|
||||
this.resists = new Resists("Dropper");
|
||||
this.atrHandOne *= 2;
|
||||
this.atrHandTwo *= 2;
|
||||
this.defenseRating *= 2;
|
||||
|
||||
@@ -46,10 +46,6 @@ public class Resists {
|
||||
case "Mine":
|
||||
setMineResists();
|
||||
break;
|
||||
case "Dropper":
|
||||
setDropperResists();
|
||||
case "HamletGuard":
|
||||
setDropperResists();
|
||||
default:
|
||||
setGenericResists();
|
||||
break;
|
||||
@@ -476,10 +472,6 @@ public class Resists {
|
||||
|
||||
public void calculateResists(AbstractCharacter ac, boolean val) {
|
||||
|
||||
if(ac.getObjectType().equals(Enum.GameObjectType.Mob) && ((Mob)ac).dropper){
|
||||
this.setDropperResists();
|
||||
return;
|
||||
}
|
||||
this.immuneTo.clear();
|
||||
|
||||
// get resists for runes
|
||||
|
||||
Reference in New Issue
Block a user