Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

More itembase refactor work

Browse Source
This commit is contained in:
MagicBot
2024-03-15 11:25:19 -04:00
parent 789e177d67
commit b9b04c2b9f
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+12 -10
View File
@@ -982,29 +982,31 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
public final float getRange() { public final float getRange() {
// Treb range does not appear to be set here
// what gives?
if (this.getObjectType() == GameObjectType.Mob) { if (this.getObjectType() == GameObjectType.Mob) {
Mob mob = (Mob) this; Mob mob = (Mob) this;
if (mob.isSiege()) { if (mob.isSiege()) {
return 300; return 300;
} }
float range = 8; float range = 8;
if (((Mob) this).getEquip().get(1) != null) { if (((Mob) this).getEquip().get(1) != null) {
range = ((Mob) this).getEquip().get(1).getItemBase().getRange(); range = ((Mob) this).getEquip().get(1).template.item_weapon_max_range;
} else if (((Mob) this).getEquip().get(2) != null) { } else if (((Mob) this).getEquip().get(2) != null) {
range = ((Mob) this).getEquip().get(2).getItemBase().getRange(); range = ((Mob) this).getEquip().get(2).template.item_weapon_max_range;
} }
if (range > 80) {
// TODO Is this clamp from live?
if (range > 80)
range = 80; range = 80;
}
return range; return range;
} }
if (this.rangeHandOne > this.rangeHandTwo) {
if (this.rangeHandOne > this.rangeHandTwo)
return this.rangeHandOne; return this.rangeHandOne;
}
return this.rangeHandTwo; return this.rangeHandTwo;
} }