projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-18 08:02:53 -04:00
Code Issues Projects Releases Wiki Activity

merge conflict resolved

Browse Source
This commit is contained in:
CharonInferar
2014-06-11 16:50:29 +02:00
parent 755e9659fd
commit 5836699b41
3 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/building/BuildingObject.java
-5
View File
@@ -223,13 +223,8 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria
return (boolean) otherVariables.get("residency");
}
<<<<<<< HEAD
public void setResidency() {
otherVariables.set("residency", true);
=======
public void setResidency(boolean flag) {
otherVariables.set("residency", flag);
>>>>>>> origin/master
}
public byte getPrivacy() {
src/services/housing/HousingService.java
-21
View File
@@ -330,10 +330,7 @@ public class HousingService implements INetworkDispatch {
if (returnList.get(0).equals(""+confirmCode)){
// handle creation of correct deed in player inventory
PlayerObject player = (PlayerObject) houseOwner.getSlottedObject("ghost");
<<<<<<< HEAD
=======
PlayerCity city = core.playerCityService.getCityObjectIsIn(building);
>>>>>>> origin/master
HouseTemplate houseTemplate = housingTemplates.get(houseToDeed.get(building.getTemplate()));
TangibleObject deed = (TangibleObject) core.objectService.createObject(houseTemplate.getDeedTemplate(), owner.getPlanet());
@@ -365,8 +362,6 @@ public class HousingService implements INetworkDispatch {
player.setLotsRemaining(player.getLotsRemaining() + houseTemplate.getLotCost());
}
<<<<<<< HEAD
=======
if(building.getResidency()) {
owner.setAttachment("residentBuilding", null);
}
@@ -381,7 +376,6 @@ public class HousingService implements INetworkDispatch {
}
}
>>>>>>> origin/master
houseOwner.sendSystemMessage("@player_structure:processing_destruction",(byte)1);
houseOwner.sendSystemMessage("@player_structure:deed_reclaimed",(byte)1);
@@ -533,10 +527,7 @@ public class HousingService implements INetworkDispatch {
public void declareResidency(SWGObject owner, TangibleObject target) {
final BuildingObject building = (BuildingObject) target.getGrandparent();
<<<<<<< HEAD
=======
PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(building);
>>>>>>> origin/master
if(owner.getObjectID() != (long) building.getAttachment("structureOwner")) {
((CreatureObject) owner).sendSystemMessage("@player_structure:declare_must_be_owner", (byte) 0);
return;
@@ -544,27 +535,16 @@ public class HousingService implements INetworkDispatch {
((CreatureObject) owner).sendSystemMessage("@player_structure:already_residence", (byte) 0);
return;
}
<<<<<<< HEAD
=======
if(((CreatureObject) owner).getPlayerObject().getCitizenship() == Citizenship.Mayor && !building.getTemplate().contains("cityhall")) { // mayors always have the city hall as their residence and cant change it
if(cityActorIsIn == null || cityActorIsIn.getMayorID() != owner.getObjectID()) {
((CreatureObject) owner).sendSystemMessage("@city/city:mayor_residence_change", (byte) 0);
return;
}
}
>>>>>>> origin/master
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;
}
<<<<<<< HEAD
building.setResidency();
PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(building);
owner.setAttachment("residencyCooldown", System.currentTimeMillis() + 86400000); // 24 hours
owner.setAttachment("residentBuilding", building.getObjectID());
((CreatureObject) owner).sendSystemMessage("@player_structure:change_residence", (byte) 0);
if(cityActorIsIn != null) {
=======
BuildingObject oldResidency = null;
if(owner.getAttachment("residentBuilding") != null && core.objectService.getObject((long) owner.getAttachment("residentBuilding")) != null) {
oldResidency = (BuildingObject) core.objectService.getObject((long) owner.getAttachment("residentBuilding"));
@@ -587,7 +567,6 @@ public class HousingService implements INetworkDispatch {
owner.setAttachment("residentBuilding", building.getObjectID());
if(cityActorIsIn != null) {
cityActorIsIn.addCitizen(owner.getObjectID());
>>>>>>> origin/master
owner.setAttachment("residentCity", cityActorIsIn.getCityID());
((CreatureObject) owner).getPlayerObject().setHome(cityActorIsIn.getCityName());
((CreatureObject) owner).getPlayerObject().setCitizenship(Citizenship.Citizen);
src/services/playercities/PlayerCity.java
-30
View File
@@ -636,15 +636,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -683,15 +677,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -757,15 +745,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -801,15 +783,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);
@@ -843,15 +819,9 @@ public class PlayerCity implements Serializable {
Vector<Long> citizenList = getCitizens();
NGECore core = NGECore.getInstance();
for (long citizen : citizenList){
<<<<<<< HEAD
CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen);
if(citizenObject == null)
citizenObject = NGECore.getInstance().objectService.getCreatureFromDB(citizen);
=======
CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen);
if(citizenObject == null)
continue;
>>>>>>> origin/master
Mail actorMail = new Mail();
actorMail.setMailId(NGECore.getInstance().chatService.generateMailId());
actorMail.setRecieverId(citizen);