EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address issue #1271

Browse Source
This commit is contained in:
TheComputerGeek2
2018-04-22 15:55:42 -07:00
committed by Magnus Ulf Jørgensen
parent 5fad79b026
commit 6635ec9710
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/engine/EnginePermBuild.java
View File

@@ -354,6 +354,8 @@ public class EnginePermBuild extends Engine
PS toPs = PS.valueOf(chunkToX, chunkToZ); PS toPs = PS.valueOf(chunkToX, chunkToZ);
TerritoryAccess fromTa = map.get(fromPs); TerritoryAccess fromTa = map.get(fromPs);
TerritoryAccess toTa = map.get(toPs); TerritoryAccess toTa = map.get(toPs);
// Null checks are needed here since automatic board cleaning can be undesired sometimes
String fromId = fromTa != null ? fromTa.getHostFactionId() : Factions.ID_NONE; String fromId = fromTa != null ? fromTa.getHostFactionId() : Factions.ID_NONE;
String toId = toTa != null ? toTa.getHostFactionId() : Factions.ID_NONE; String toId = toTa != null ? toTa.getHostFactionId() : Factions.ID_NONE;
@@ -362,7 +364,9 @@ public class EnginePermBuild extends Engine
// ... and the faction "from" can not build at "to" ... // ... and the faction "from" can not build at "to" ...
Faction fromFac = FactionColl.get().getFixed(fromId); Faction fromFac = FactionColl.get().getFixed(fromId);
if (fromFac == null) fromFac = FactionColl.get().getNone();
Faction toFac = FactionColl.get().getFixed(toId); Faction toFac = FactionColl.get().getFixed(toId);
if (toFac == null) toFac = FactionColl.get().getNone();
if (MPerm.getPermBuild().has(fromFac, toFac)) return; if (MPerm.getPermBuild().has(fromFac, toFac)) return;
// ... cancel the event! // ... cancel the event!