JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug where claiming a new land would display that land as neutral

Browse Source
This commit is contained in:
Shaun Bennett 2015-08-29 13:56:26 -07:00
parent fae27df496
commit 62cf58bd55
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/.idea/compiler.xml
View File

@ -5,7 +5,6 @@
<excludeFromCompile>
<directory url="file://$PROJECT_DIR$/Nautilus.Game.PvP" includeSubdirectories="true" />
<directory url="file://$PROJECT_DIR$/Mineplex.ServerMonitor" includeSubdirectories="true" />
<directory url="file://$PROJECT_DIR$/Nautilus.Game.Arcade" includeSubdirectories="true" />
</excludeFromCompile>
<resourceExtensions />
<wildcardResourcePatterns>

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
View File

@ -594,6 +594,12 @@ public class ClanInfo
if (p != null) playerOffline(p);
}
@Override
public String toString()
{
return _id + "," + _name;
}
public void playerOffline(Player player)
{
_onlinePlayers.remove(player.getUniqueId());

1
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
View File

@ -456,6 +456,7 @@ public class ClansDataAccessLayer
ClanTerritory claim = new ClanTerritory();
claim.Owner = name;
claim.Safe = safe;
claim.Chunk = chunk;
clan.getClaimSet().add(chunk);
_manager.getClaimMap().put(chunk, claim);

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java
View File

@ -6,6 +6,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.Location;
@ -449,7 +450,7 @@ public class ClansUtility
public ClanRelation rel(ClanInfo cA, ClanInfo cB)
{
if (cA == null || cB == null)
if (cA == null || cB == null)
return ClanRelation.NEUTRAL;
//Self