From 23e116f9b519c6572074f3c6410b5621ba9ef40b Mon Sep 17 00:00:00 2001
From: Shaun Bennett <shaun@mineplex.com>
Date: Mon, 4 Apr 2016 17:10:52 +1000
Subject: [PATCH] Region fixes

---
 .../game/clans/clans/ClansManager.java        | 35 +++++++++----------
 .../clans/clans/regions/ClansRegions.java     | 24 +++++--------
 .../clans/tutorial/TutorialWorldManager.java  |  4 +--
 3 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
index 8b2f50822..468f3a29a 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
@@ -357,30 +357,27 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
 		
 		List<Location> jumpOffHolograms = Arrays.asList(
 				// West Spawn
-				new Location(Spawn.getSpawnWorld(), -295.5, 204, 36.5),
-				new Location(Spawn.getSpawnWorld(), -295.5, 204, -26.5),
-				new Location(Spawn.getSpawnWorld(), -331.5, 204, 6.5),
-				new Location(Spawn.getSpawnWorld(), -266.5, 204, 6.5),
+				new Location(Spawn.getSpawnWorld(), 8, 204, 359),
+				new Location(Spawn.getSpawnWorld(), 34, 204, 390),
+				new Location(Spawn.getSpawnWorld(), 8, 204, 418),
+				new Location(Spawn.getSpawnWorld(), -25, 204, 390),
 				
 				// East Spawn
-				new Location(Spawn.getSpawnWorld(), 304.5, 207, -26.5),
-				new Location(Spawn.getSpawnWorld(), 332.5, 207, 6.5),
-				new Location(Spawn.getSpawnWorld(), 304.5, 207, 36.5),
-				new Location(Spawn.getSpawnWorld(), 268.5, 207, 6.5)
+				new Location(Spawn.getSpawnWorld(), 34, 207, -393),
+				new Location(Spawn.getSpawnWorld(), 8, 207, -365),
+				new Location(Spawn.getSpawnWorld(), -25, 207, -393),
+				new Location(Spawn.getSpawnWorld(), 8, 207, -424)
 		);
 		
 		List<Location> welcomeHolograms = Arrays.asList(
-				// West Spawn
-				new Location(Spawn.getSpawnWorld(), -304.5, 204, 6.5),
-				new Location(Spawn.getSpawnWorld(), -295.5, 204, 15.5),
-				new Location(Spawn.getSpawnWorld(), -286.5, 204, 6.5),
-				new Location(Spawn.getSpawnWorld(), -295.5, 204, -2.5),
-				
-				// East Spawn
-				new Location(Spawn.getSpawnWorld(), 295.5, 207, 6.5),
-				new Location(Spawn.getSpawnWorld(), 304.5, 207, -2.5),
-				new Location(Spawn.getSpawnWorld(), 313.5, 207, 6.5),
-				new Location(Spawn.getSpawnWorld(), 304.5, 207, 15.5)
+				new Location(Spawn.getSpawnWorld(), 17, 204, 390),
+				new Location(Spawn.getSpawnWorld(), 8, 204, 399),
+				new Location(Spawn.getSpawnWorld(), 0, 204, 390),
+				new Location(Spawn.getSpawnWorld(), 8, 204, 381),
+				new Location(Spawn.getSpawnWorld(), 8, 207, -384),
+				new Location(Spawn.getSpawnWorld(), 0, 207, -393),
+				new Location(Spawn.getSpawnWorld(), 8, 207, -402),
+				new Location(Spawn.getSpawnWorld(), 17, 207, -393)
 		);
 		
 		for (Location location : jumpOffHolograms)
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
index a414f5486..8ee9a773c 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
@@ -144,21 +144,8 @@ public class ClansRegions extends MiniPlugin
 	{
 		final ClanInfo clan = _manager.getClan(clanName);
 
-		// Only claim if the clan doesn't have claims. Speeds up startup time
-		if (clan == null || clan.getClaimSet().size() == 0)
+		if (clan == null)
 		{
-			if (clan != null)
-			{
-				for (Location location : locations)
-				{
-					claimArea(clan, location, chunkRadius, claimOffset, addNegative, safe);
-					log(String.format("Initialized %s faction territory and creation!", clanName));
-				}
-
-				debugClan(clanName);
-				return;
-			}
-
 			_manager.getClanDataAccess().create("ClansRegions", clanName, true, new Callback<ClanInfo>()
 			{
 				@Override
@@ -171,7 +158,7 @@ public class ClansRegions extends MiniPlugin
 							claimArea(data, location, chunkRadius, claimOffset, addNegative, safe);
 							log(String.format("Initialized %s faction territory and creation!", clanName));
 						}
-						
+
 						debugClan(clanName);
 					}
 					else
@@ -182,6 +169,13 @@ public class ClansRegions extends MiniPlugin
 				}
 			});
 		}
+		else
+		{
+			for (Location location : locations)
+			{
+				claimArea(clan, location, chunkRadius, claimOffset, addNegative, safe);
+			}
+		}
 	}
 	
 	/*private void claimArea(String clanName, int chunkRadius, int claimOffset, boolean safe, Location... locations)
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java
index 01215d6fe..40ac68fc6 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialWorldManager.java
@@ -59,9 +59,9 @@ public class TutorialWorldManager extends MiniPlugin
 		_regionStack = new Stack<>();
 
 		// Populate the stack with 100 available tutorial regions
-		for (int x = 0; x < 4; x++)
+		for (int x = 0; x < 10; x++)
 		{
-			for (int z = 0; z < 4; z++)
+			for (int z = 0; z < 10; z++)
 			{
 				long time = System.currentTimeMillis();
 				double xLoc = (x) * BLOCKS_BETWEEN_TUTORIALS; // 1000x1000 regions