Fix a bug where you could not claim a startingpoint for your base in another world
This commit is contained in:
parent
34d2dcb97b
commit
66991fba02
@ -817,7 +817,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
|
||||
}
|
||||
public int getLandCountInWorld(String worldName)
|
||||
{
|
||||
return BoardColls.get().get(worldName).getCount(this);
|
||||
return Board.get(worldName).getCount(this);
|
||||
}
|
||||
|
||||
public boolean hasLandInflation()
|
||||
|
@ -110,7 +110,7 @@ public class UConf extends Entity<UConf>
|
||||
|
||||
public boolean claimsMustBeConnected = true;
|
||||
public boolean claimingFromOthersAllowed = true;
|
||||
public boolean claimsCanBeUnconnectedIfOwnedByOtherFaction = true;
|
||||
public boolean claimsCanBeUnconnectedIfOwnedByOtherFaction = false;
|
||||
public int claimsRequireMinFactionMembers = 1;
|
||||
public int claimedLandsMax = 0;
|
||||
|
||||
|
@ -667,9 +667,12 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
|
||||
if
|
||||
(
|
||||
uconf.claimsMustBeConnected
|
||||
&& newFaction.getLandCountInWorld(ps.getWorld()) > 0
|
||||
&& !BoardColls.get().isConnectedPs(chunk, newFaction)
|
||||
&& (!uconf.claimsCanBeUnconnectedIfOwnedByOtherFaction || !oldFaction.isNormal())
|
||||
&&
|
||||
newFaction.getLandCountInWorld(ps.getWorld()) > 0
|
||||
&&
|
||||
!BoardColls.get().isConnectedPs(chunk, newFaction)
|
||||
&&
|
||||
(!uconf.claimsCanBeUnconnectedIfOwnedByOtherFaction || oldFaction.isNone())
|
||||
)
|
||||
{
|
||||
if (uconf.claimsCanBeUnconnectedIfOwnedByOtherFaction)
|
||||
|
Loading…
Reference in New Issue
Block a user