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

Mesh set properly when errant mine loaded.

Browse Source
This commit is contained in:
MagicBot
2023-01-13 14:34:04 -05:00
parent a06420eae3
commit a76534f0af
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Mine.java
+20 -7
View File
@@ -123,13 +123,11 @@ public class Mine extends AbstractGameObject {
nation = Guild.getErrantGuild(); nation = Guild.getErrantGuild();
this.owningGuild = Guild.getErrantGuild(); this.owningGuild = Guild.getErrantGuild();
} }
int mineTime = this.owningGuild.getMineTime();
if(!nation.isErrant()) { if(!nation.isErrant()) {
this.nationName = nation.getName(); this.nationName = nation.getName();
this.nationTag = nation.getGuildTag(); this.nationTag = nation.getGuildTag();
mineTime = nation.getMineTime();
} else { } else {
this.nationName = ""; this.nationName = "";
this.nationTag = GuildTag.ERRANT; this.nationTag = GuildTag.ERRANT;
@@ -227,11 +225,26 @@ try{
// If errant use mine stays open. // If errant use mine stays open.
if (this.owningGuild == null || this.owningGuild.isErrant() == true) if (this.owningGuild == null || this.owningGuild.isErrant() == true) {
return;
if (this.owningGuild != null) // Update mesh
nation = this.owningGuild.getNation();
Building mineBuilding = BuildingManager.getBuildingFromCache(this.buildingID);
if (mineBuilding == null){
Logger.debug( "Null mine building " + this.getObjectUUID() +". Unable to Load Building with UID " +this.buildingID);
return;
}
mineBuilding.healthMax = (float) 1;
mineBuilding.meshUUID = mineBuilding.getBlueprint().getMeshForRank(-1);
mineBuilding.setRank(-1);
mineBuilding.setCurrentHitPoints((float) 1);
return;
}
nation = this.owningGuild.getNation();
int mineTime = (nation != null && !nation.isErrant()) ? nation.getMineTime() : MBServerStatics.MINE_EARLY_WINDOW; int mineTime = (nation != null && !nation.isErrant()) ? nation.getMineTime() : MBServerStatics.MINE_EARLY_WINDOW;