MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Bitvectors use int not long for mb

Browse Source
This commit is contained in:
MagicBot
2024-04-22 12:48:03 -04:00
parent dbab8f66da
commit 79079e200a
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mbEnums.java
+2 -2
View File
@@ -44,7 +44,7 @@ public class mbEnums {
return bitvector; return bitvector;
} }
public static <E extends java.lang.Enum<E>> EnumSet<E> fromLong(long bitVector, Class<E> enumClass) { public static <E extends java.lang.Enum<E>> EnumSet<E> fromInt(int bitVector, Class<E> enumClass) {
// Bitvector -> EnumSet without the EnumBitvector dependency // Bitvector -> EnumSet without the EnumBitvector dependency
@@ -56,7 +56,7 @@ public class mbEnums {
return enumSet; return enumSet;
for (E enumValue : enumClass.getEnumConstants()) { for (E enumValue : enumClass.getEnumConstants()) {
if ((bitVector & (1L << enumValue.ordinal())) != 0) { if ((bitVector & (1 << enumValue.ordinal())) != 0) {
enumSet.add(enumValue); enumSet.add(enumValue);
} }
} }
src/engine/objects/ItemTemplate.java
+2 -2
View File
@@ -502,11 +502,11 @@ public class ItemTemplate {
int group_tactics_bitvector = jsonObject.getInt("rune_group_tactics"); int group_tactics_bitvector = jsonObject.getInt("rune_group_tactics");
rune_group_tactics.addAll(mbEnums.fromLong(group_tactics_bitvector, mbEnums.MobBehaviourType.class)); rune_group_tactics.addAll(mbEnums.fromInt(group_tactics_bitvector, mbEnums.MobBehaviourType.class));
int group_role_bitvector = jsonObject.getInt("rune_group_role_set"); int group_role_bitvector = jsonObject.getInt("rune_group_role_set");
rune_group_role_set.addAll(mbEnums.fromLong(group_role_bitvector, mbEnums.MobBehaviourType.class)); rune_group_role_set.addAll(mbEnums.fromInt(group_role_bitvector, mbEnums.MobBehaviourType.class));
JSONArray enemy_types_json = jsonObject.getJSONArray("rune_enemy_monster_types"); JSONArray enemy_types_json = jsonObject.getJSONArray("rune_enemy_monster_types");
src/engine/objects/Mob.java
+2 -2
View File
@@ -143,8 +143,8 @@ public class Mob extends AbstractIntelligenceAgent implements Delayed {
this.runeSet = rs.getInt("runeSet"); this.runeSet = rs.getInt("runeSet");
this.bootySet = rs.getInt("bootySet"); this.bootySet = rs.getInt("bootySet");
this.notEnemy = mbEnums.fromLong(rs.getLong("notEnemy"), mbEnums.MonsterType.class); this.notEnemy = mbEnums.fromInt(rs.getInt("notEnemy"), mbEnums.MonsterType.class);
this.enemy = mbEnums.fromLong(rs.getLong("enemy"), mbEnums.MonsterType.class); this.enemy = mbEnums.fromInt(rs.getInt("enemy"), mbEnums.MonsterType.class);
this.firstName = rs.getString("mob_name"); this.firstName = rs.getString("mob_name");
if (rs.getString("fsm").length() > 1) if (rs.getString("fsm").length() > 1)
src/engine/objects/MobBase.java
+3 -3
View File
@@ -77,9 +77,9 @@ public class MobBase extends AbstractGameObject {
this.fsm = mbEnums.MobBehaviourType.valueOf(rs.getString("fsm")); this.fsm = mbEnums.MobBehaviourType.valueOf(rs.getString("fsm"));
this.flags = mbEnums.fromLong(rs.getLong("flags"), mbEnums.MobFlagType.class); this.flags = mbEnums.fromInt(rs.getInt("flags"), mbEnums.MobFlagType.class);
this.notEnemy = mbEnums.fromLong(rs.getLong("notEnemy"), mbEnums.MonsterType.class); this.notEnemy = mbEnums.fromInt(rs.getInt("notEnemy"), mbEnums.MonsterType.class);
this.enemy = mbEnums.fromLong(rs.getLong("enemy"), mbEnums.MonsterType.class); this.enemy = mbEnums.fromInt(rs.getInt("enemy"), mbEnums.MonsterType.class);
this.seeInvis = rs.getInt("seeInvis"); this.seeInvis = rs.getInt("seeInvis");
this.scale = rs.getFloat("scale"); this.scale = rs.getFloat("scale");