diff --git a/ngengine_public.jar b/ngengine_public.jar index 2dbdc9f0..91d5298a 100644 Binary files a/ngengine_public.jar and b/ngengine_public.jar differ diff --git a/src/resources/objects/building/BuildingObject.java b/src/resources/objects/building/BuildingObject.java index af7dab08..5964ca6b 100644 --- a/src/resources/objects/building/BuildingObject.java +++ b/src/resources/objects/building/BuildingObject.java @@ -223,8 +223,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria return (boolean) otherVariables.get("residency"); } - public void setResidency(CreatureObject owner){ - owner.sendSystemMessage("@player_structure:declared_residency", (byte) 1); + public void setResidency() { otherVariables.set("residency", true); } diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index a9592bd4..d92d3589 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -42,6 +42,8 @@ import java.util.concurrent.atomic.AtomicReference; import main.NGECore; import protocol.swg.EnterStructurePlacementModeMessage; +import resources.common.OutOfBand; +import resources.datatables.Citizenship; import resources.datatables.DisplayType; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; @@ -510,11 +512,26 @@ public class HousingService implements INetworkDispatch { public void declareResidency(SWGObject owner, TangibleObject target) { final BuildingObject building = (BuildingObject) target.getGrandparent(); - //final BuildingObject building = (BuildingObject) target.getAttachment("housing_parentstruct"); - building.setResidency((CreatureObject)owner); - PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(owner); + if(owner.getObjectID() != (long) building.getAttachment("structureOwner")) { + ((CreatureObject) owner).sendSystemMessage("@player_structure:declare_must_be_owner", (byte) 0); + return; + } else if(building.getResidency()) { + ((CreatureObject) owner).sendSystemMessage("@player_structure:already_residence", (byte) 0); + return; + } + if(System.currentTimeMillis() < (long) owner.getAttachment("residencyCooldown")) { + ((CreatureObject) owner).sendSystemMessage(OutOfBand.ProsePackage("@player_structure:change_residence_time", "DI", (int) ((long) owner.getAttachment("residencyCooldown") - System.currentTimeMillis()) / 3600000), (byte) 0); + return; + } + building.setResidency(); + PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(building); owner.setAttachment("residentCity", cityActorIsIn.getCityID()); - //owner.setResidence(); + owner.setAttachment("residencyCooldown", System.currentTimeMillis() + 86400000); // 24 hours + ((CreatureObject) owner).sendSystemMessage("@player_structure:change_residence", (byte) 0); + if(cityActorIsIn != null) { + ((CreatureObject) owner).getPlayerObject().setHome(cityActorIsIn.getCityName()); + ((CreatureObject) owner).getPlayerObject().setCitizenship(Citizenship.Citizen); + } } public void handleListAllItems(SWGObject owner, TangibleObject target) { diff --git a/src/services/playercities/PlayerCity.java b/src/services/playercities/PlayerCity.java index 6caaf000..7b738232 100644 --- a/src/services/playercities/PlayerCity.java +++ b/src/services/playercities/PlayerCity.java @@ -630,7 +630,9 @@ public class PlayerCity implements Serializable { // city_version_update_body_4 Vector citizenList = getCitizens(); for (long citizen : citizenList){ -// CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + if(citizenObject == null) + citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen); Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); @@ -638,24 +640,24 @@ public class PlayerCity implements Serializable { actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); actorMail.setMessage("@city/city:city_version_update_body_4"); actorMail.setSubject("@city/city:city_version_update_subject_4"); - actorMail.setSenderName("City " + this.cityName); - -// List attachments = new ArrayList(); -// WaypointAttachment attachment = new WaypointAttachment(); -// attachment.active = false; -// attachments.add(attachment); -// attachment.cellID = constructionWaypoint.getCellId(); -// attachment.color = (byte)1; -// attachment.name = "City"; -// attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); -// attachment.positionX = object.getPosition().x; -// attachment.positionY = 0; -// attachment.positionZ = object.getPosition().z; -// actorMail.setAttachments(attachments); + actorMail.setSenderName("City: " + this.cityName); + /* + List attachments = new ArrayList(); + WaypointAttachment attachment = new WaypointAttachment(); + attachment.active = false; + attachments.add(attachment); + attachment.cellID = 0; + attachment.color = (byte)1; + attachment.name = "City"; + attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); + attachment.positionX = object.getPosition().x; + attachment.positionY = 0; + attachment.positionZ = object.getPosition().z; + actorMail.setWaypointAttachments(attachments);*/ NGECore.getInstance().chatService.storePersistentMessage(actorMail); -// if (newCitizen.getClient()!=null) -// NGECore.getInstance().chatService.sendPersistentMessageHeader(newCitizen.getClient(), actorMail); + if (citizenObject.getClient()!=null) + NGECore.getInstance().chatService.sendPersistentMessageHeader(citizenObject.getClient(), actorMail); } } @@ -669,6 +671,8 @@ public class PlayerCity implements Serializable { Vector citizenList = getCitizens(); for (long citizen : citizenList){ CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + if(citizenObject == null) + citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen); Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); @@ -734,6 +738,8 @@ public class PlayerCity implements Serializable { Vector citizenList = getCitizens(); for (long citizen : citizenList){ CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + if(citizenObject == null) + citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen); Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); @@ -769,6 +775,8 @@ public class PlayerCity implements Serializable { Vector citizenList = getCitizens(); for (long citizen : citizenList){ CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + if(citizenObject == null) + citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen); Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); @@ -802,6 +810,8 @@ public class PlayerCity implements Serializable { Vector citizenList = getCitizens(); for (long citizen : citizenList){ CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + if(citizenObject == null) + citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen); Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen);