From 18c184ea79809edab54e544c9bf097a290ff73df Mon Sep 17 00:00:00 2001
From: CharonInferar <CharonInferar@aol.de>
Date: Sat, 12 Apr 2014 03:04:17 +0200
Subject: [PATCH] Cleanup

---
 options.cfg                                   |  4 +-
 .../radial/structure_management_terminal.py   |  4 +-
 src/services/housing/HousingService.java      | 37 +++++++++----------
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/options.cfg b/options.cfg
index cb743c88..5a3a7f8e 100644
--- a/options.cfg
+++ b/options.cfg
@@ -1,3 +1,3 @@
-LOAD.SNAPSHOT_OBJECTS=0
-LOAD.BUILDOUT_OBJECTS=0
+LOAD.SNAPSHOT_OBJECTS=1
+LOAD.BUILDOUT_OBJECTS=1
 LOAD.RESOURCE.SYSTEM=1
\ No newline at end of file
diff --git a/scripts/radial/structure_management_terminal.py b/scripts/radial/structure_management_terminal.py
index 914133ef..b6e7ae3a 100644
--- a/scripts/radial/structure_management_terminal.py
+++ b/scripts/radial/structure_management_terminal.py
@@ -2,14 +2,12 @@ from resources.common import RadialOptions
 from protocol.swg import ResourceListForSurveyMessage
 from services.sui.SUIService import MessageBoxType
 from services.sui.SUIWindow import Trigger
-from tools import JythonUtilities
 from java.util import Vector
 import sys
 
 def createRadial(core, owner, target, radials):
 	#(byte parentId, short optionId, byte optionType, String description)
 	radials.clear()
-	owner.sendSystemMessage('target template ' + target.getTemplate(),1)
 	radials.add(RadialOptions(0, 7, 0, 'Examine'))
 	radials.add(RadialOptions(0, 78, 0, '@player_structure:management'))
 	radials.add(RadialOptions(0, 117, 0, '@player_structure:permissions'))	
@@ -18,7 +16,7 @@ def createRadial(core, owner, target, radials):
 	radials.add(RadialOptions(2, 129, 0, '@player_structure:management_pay')) 
 	radials.add(RadialOptions(2,  50, 0, '@base_player:set_name')) 
 	radials.add(RadialOptions(2,  127, 0, '@player_structure:management_residence')) 
-	#radials.add(RadialOptions(2,  125, 0, '@player_structure:management_privacy : ' + core.housingService.fetchPrivacyString(target)))
+	radials.add(RadialOptions(2,  125, 0, '@player_structure:management_privacy : ' + core.housingService.fetchPrivacyString(target)))
 	radials.add(RadialOptions(2,  171, 0, '@player_structure:find_items_find_all_house_items'))
 	radials.add(RadialOptions(2,  173, 0, '@player_structure:move_first_item'))
 	radials.add(RadialOptions(2,  174, 0, '@player_structure:find_items_search_for_house_items'))
diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java
index 5db53834..e1526ef7 100644
--- a/src/services/housing/HousingService.java
+++ b/src/services/housing/HousingService.java
@@ -70,11 +70,11 @@ public class HousingService implements INetworkDispatch {
 	
 	public void enterStructureMode(CreatureObject actor, TangibleObject deed)
 	{	
-//		if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, actor.getWorldPosition().x, actor.getWorldPosition().z))
-//		{
-//			actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
-//			return;
-//		}
+		if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, actor.getWorldPosition().x, actor.getWorldPosition().z))
+		{
+			actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
+			return;
+		}
 		
 		if(housingTemplates.containsKey(deed.getTemplate()))
 		{
@@ -91,18 +91,18 @@ public class HousingService implements INetworkDispatch {
 		int structureLotCost = houseTemplate.getLotCost();
 		String structureTemplate = houseTemplate.getBuildingTemplate();
 		
-//		if(!houseTemplate.canBePlacedOn(actor.getPlanet().getName()))
-//		{
-//			actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf
-//			return;
-//		}
-//		
-//		if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, positionX, positionZ))
-//		{
-//			actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
-//			return;
-//		}
-//		
+		if(!houseTemplate.canBePlacedOn(actor.getPlanet().getName()))
+		{
+			actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf
+			return;
+		}
+		
+		if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, positionX, positionZ))
+		{
+			actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
+			return;
+		}
+		
 		// Lot stuff
 		if(!actor.getPlayerObject().deductLots(structureLotCost))
 		{
@@ -753,9 +753,6 @@ public class HousingService implements INetworkDispatch {
 		return building.getPrivacyString();
 	}
 	
-	public String fetchStringFromCastedClass(SWGObject object, String classToCastTo, String methodName){
-		return tools.JythonUtilities.fetchStringFromCastedClass(object,classToCastTo,methodName);
-	}
 	
 	@Override
 	public void insertOpcodes(Map<Integer, INetworkRemoteEvent> arg0,