projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-15 00:07:39 -04:00
Code Issues Projects Releases Wiki Activity

Updated Housing service

Browse Source 
Housing service detects if new citizen builds structure
and adds him as citizen to the city
This commit is contained in:
CharonInferar
2014-04-24 01:20:02 +02:00
parent fbc4ddc85f
commit 42724a76d6
22 changed files with 172 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/DevService.java
+4 -9
View File
@@ -1223,20 +1223,15 @@ public class DevService implements INetworkDispatch {
Player_House_Deed deed = (Player_House_Deed)core.objectService.createObject(templateString, planet);
deed.setBMR(15);
deed.setAttributes();
<<<<<<< HEAD
inventory.add(deed);
inventory.add(deed);
templateString="object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff";
deed = (Player_House_Deed)core.objectService.createObject(templateString, planet);
deed.setBMR(15);
deed.setAttributes();
inventory.add(deed);
break;
=======
inventory.add(deed);
return;
>>>>>>> upstream/master
return;
case 125:
TangibleObject genericCraftingTool = (TangibleObject) core.objectService.createObject("object/tangible/crafting/station/shared_generic_tool.iff", planet);
genericCraftingTool.setCustomName("Generic Crafting Tool");