Browse Source

Setting last claimer properly during claim.

master
MagicBot 2 years ago
parent
commit
cbd9021cfa
  1. 14
      src/engine/objects/Mine.java
  2. 5
      src/engine/powers/poweractions/ClaimMinePowerAction.java

14
src/engine/objects/Mine.java

@ -548,19 +548,7 @@ public class Mine extends AbstractGameObject { @@ -548,19 +548,7 @@ public class Mine extends AbstractGameObject {
if (!updateGuildOwner(claimer))
return false;
// Not the Same session for this character?
// Claimers may not relog or they lose claim.
if (this.lastClaimer != null) {
if (SessionManager.getSession(lastClaimer).getSessionID() !=
this.lastClaimerSessionID) {
this.lastClaimer = null;
this.lastClaimerSessionID = null;
Mine.setLastChange(System.currentTimeMillis());
return false;
}
}
this.lastClaimer = claimer;
// Successful claim
return true;

5
src/engine/powers/poweractions/ClaimMinePowerAction.java

@ -28,12 +28,15 @@ public class ClaimMinePowerAction extends AbstractPowerAction { @@ -28,12 +28,15 @@ public class ClaimMinePowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || awo == null)
return;
if (!(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter playerCharacter = (PlayerCharacter) source;
if (!(awo.getObjectType().equals(Enum.GameObjectType.Building)))
return;
@ -47,7 +50,7 @@ public class ClaimMinePowerAction extends AbstractPowerAction { @@ -47,7 +50,7 @@ public class ClaimMinePowerAction extends AbstractPowerAction {
if (mine == null)
return;
if (mine.claimMine((PlayerCharacter) source) == true)
if (mine.claimMine(playerCharacter) == true)
ChatManager.sendSystemMessage( (PlayerCharacter) source, "You successfully claimed this mine..");
else
ChatManager.sendSystemMessage( (PlayerCharacter) source, "Your attempt for to claim this mine failed.");

Loading…
Cancel
Save