release-1.3 #13

Merged
MagicBot merged 40 commits from release-1.3 into master 2022-07-13 17:55:56 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit f8a9262fc5 - Show all commits
+1 -1
View File
@@ -291,7 +291,7 @@ public class CombatUtilities {
else
//check for a cast here?
agent.mobPowers = DbManager.MobBaseQueries.LOAD_STATIC_POWERS(agent.getMobBaseID());
//agent.mobPowers = DbManager.MobBaseQueries.LOAD_STATIC_POWERS(agent.getMobBaseID());
if(agent.mobPowers.size() > 0 && agent.mobPowers != null)
{
+1 -1
View File
@@ -2203,7 +2203,7 @@ public class Mob extends AbstractIntelligenceAgent {
} catch(Exception e){
Logger.error( e.getMessage());
}
mobPowers = DbManager.MobBaseQueries.LOAD_STATIC_POWERS(this.getMobBaseID());
if (this.equip == null) {
Logger.error("Null equipset returned for uuid " + currentID);
this.equip = new HashMap<>(0);