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

added none check to enemy and notEnemy in mobbase

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-04-22 17:52:55 -05:00
parent 1d74643fe3
commit 344c5900b8
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/Enum.java
-1
View File
@@ -50,7 +50,6 @@ public class Enum {
} }
public enum MonsterType implements EnumBitSetHelper<MonsterType> { public enum MonsterType implements EnumBitSetHelper<MonsterType> {
None,
Aelfborn, Aelfborn,
All, All,
Animal, Animal,
src/engine/objects/MobBase.java
+8 -3
View File
@@ -109,9 +109,14 @@ public class MobBase extends AbstractGameObject {
} }
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class); this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class);
if(rs.getLong("notEnemy") == 0)
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class); this.notEnemy = EnumBitSet.noneOf(Enum.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class); else
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
if(rs.getLong("enemy") == 0)
this.enemy = EnumBitSet.noneOf(Enum.MonsterType.class);
else
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
this.seeInvis = rs.getInt("seeInvis"); this.seeInvis = rs.getInt("seeInvis");
this.scale = rs.getFloat("scale"); this.scale = rs.getFloat("scale");