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

More slotting work.

Browse Source
This commit is contained in:
MagicBot
2023-04-04 15:36:56 -04:00
parent 1c496b3c98
commit 65e7566d0f
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Mob.java
+1 -2
View File
@@ -807,8 +807,7 @@ public class Mob extends AbstractIntelligenceAgent {
// only if this building has a blueprint. // only if this building has a blueprint.
// otherwise use the mob cache location. // otherwise use the mob cache location.
if (this.building != null && building.getBlueprintUUID() != 0 if (this.building != null && building.getBlueprintUUID() != 0) {
&& this.loadID != 0) {
int maxSlots = 10; int maxSlots = 10;
src/engine/objects/NPC.java
+1 -5
View File
@@ -132,7 +132,6 @@ public class NPC extends AbstractCharacter {
this.parentZone = parent; this.parentZone = parent;
initializeMob();
clearStatic(); clearStatic();
this.dbID = MBServerStatics.NO_DB_ROW_ASSIGNED_YET; this.dbID = MBServerStatics.NO_DB_ROW_ASSIGNED_YET;
@@ -356,8 +355,7 @@ public class NPC extends AbstractCharacter {
// For some reason the npc is created and initialized twice when // For some reason the npc is created and initialized twice when
// createMobWithNoID() is called. // createMobWithNoID() is called.
if (this.building != null && if (this.building != null) {
this.loadID != 0) {
// Artillery Tower Captains use a hardcoded slot not first available // Artillery Tower Captains use a hardcoded slot not first available
@@ -1617,8 +1615,6 @@ public class NPC extends AbstractCharacter {
if (npc.building == null) if (npc.building == null)
return -1; return -1;
BuildingModelBase buildingModel = BuildingModelBase.getModelBase(npc.building.getMeshUUID()); BuildingModelBase buildingModel = BuildingModelBase.getModelBase(npc.building.getMeshUUID());
if (buildingModel == null) if (buildingModel == null)