Merge branch 'construction-cbt' into 'master'

Another potential fix for construction

See merge request 2009scape/2009scape!108

Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java

@@ -267,10 +267,16 @@ public final class HouseManager {
 		int diffX = player.getLocation().getX() - r.getBaseLocation().getX();
 		int diffY = player.getLocation().getY() - r.getBaseLocation().getY();
 		int diffZ = player.getLocation().getZ() - r.getBaseLocation().getZ();
+		DynamicRegion dr = region;
+		DynamicRegion dd = dungeon;
+		RegionManager.getRegionCache().remove(dr);
+		RegionManager.getRegionCache().remove(dd);
 		region = null;
 		dungeon = null;
 		enter(player, buildingMode, false);
 		player.getProperties().setTeleportLocation((player.getViewport().getRegion() == dungeon ? dungeon : region).getBaseLocation().transform(diffX, diffY, diffZ));
+		dr.flagInactive();
+		dd.flagInactive();
 	}
 
 	/**

Server/src/main/java/core/game/world/map/Region.java

@@ -299,22 +299,31 @@ public class Region {
 		}
 	}
 
+	/**
+	 * Unloads a region - compatibility method for older uses
+	 */
+	private static void unload(Region r){
+		unload(r, false);
+	}
+
 	/**
 	 * Unloads a region.
 	 * @param r The region.
 	 */
-	private static void unload(Region r) {
+	private static void unload(Region r, boolean force) {
-		if (r.isViewed()) {
+		if(!force){
-			SystemLogger.logErr("Players viewing region!");
+			if (r.isViewed()) {
-			r.flagActive();
+				SystemLogger.logErr("Players viewing region!");
-			return;
-		}
-		for (RegionPlane p : r.planes) {
-			if (!p.getPlayers().isEmpty()) {
-				SystemLogger.logErr("Players still in region!");
 				r.flagActive();
 				return;
 			}
+			for (RegionPlane p : r.planes) {
+				if (!p.getPlayers().isEmpty()) {
+					SystemLogger.logErr("Players still in region!");
+					r.flagActive();
+					return;
+				}
+			}
 		}
 		for (RegionPlane p : r.planes) {
 			p.clear();