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

Merge branch 'bugfix-runesandbooties' into new-booty-system

Browse Source 
# Conflicts:
#	src/engine/objects/MobBase.java
This commit is contained in:
FatBoy-DOTC
2023-04-06 20:08:29 -05:00
parent 95352e778d 88bf38b858
commit 1be669aa66
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/MobBase.java
+4 -1
View File
@@ -60,7 +60,8 @@ public class MobBase extends AbstractGameObject {
private float run = 0; private float run = 0;
private float walkCombat = 0; private float walkCombat = 0;
private float runCombat = 0; private float runCombat = 0;
public ArrayList<BootySetEntry> bootySets; public int bootySet;
public String fsm = "";
/** /**
* ResultSet Constructor * ResultSet Constructor
*/ */
@@ -84,6 +85,8 @@ public class MobBase extends AbstractGameObject {
this.attackRating = rs.getInt("atr"); this.attackRating = rs.getInt("atr");
this.defenseRating = rs.getInt("defense"); this.defenseRating = rs.getInt("defense");
this.attackRange = rs.getFloat("attackRange"); this.attackRange = rs.getFloat("attackRange");
this.bootySet = rs.getInt("bootySet");
this.fsm = rs.getString("fsm");
if (MobbaseGoldEntry.MobbaseGoldMap.containsKey(this.loadID)){ if (MobbaseGoldEntry.MobbaseGoldMap.containsKey(this.loadID)){
MobbaseGoldEntry goldEntry = MobbaseGoldEntry.MobbaseGoldMap.get(this.loadID); MobbaseGoldEntry goldEntry = MobbaseGoldEntry.MobbaseGoldMap.get(this.loadID);