projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-27 17:57:22 -04:00
Code Issues Projects Releases Wiki Activity

more residency fixes

Browse Source
This commit is contained in:
Light2
2014-06-10 23:39:35 +02:00
parent 721634b406
commit 1580cc9bee
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/protocol/swg/CharacterSheetResponseMessage.java
+15 -6
View File
@@ -27,6 +27,7 @@ import main.NGECore;
import org.apache.mina.core.buffer.IoBuffer;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
import resources.objects.player.PlayerObject;
import engine.resources.common.CRC;
@@ -90,16 +91,24 @@ public class CharacterSheetResponseMessage extends SWGMessage {
buffer.putFloat(0); // bank y
buffer.put(getAsciiString("tatooine"));
buffer.putFloat(0); // home x
buffer.putFloat(0); // home z
buffer.putFloat(0); // home y
buffer.put(getAsciiString("")); // home planet
if(creature.getAttachment("residentBuilding") == null) {
buffer.putFloat(0); // home x
buffer.putFloat(0); // home z
buffer.putFloat(0); // home y
buffer.put(getAsciiString("")); // home planet
} else {
BuildingObject building = (BuildingObject) NGECore.getInstance().objectService.getObject((long) creature.getAttachment("residentBuilding"));
buffer.putFloat(building.getPosition().x); // home x
buffer.putFloat(building.getPosition().y); // home z
buffer.putFloat(building.getPosition().z); // home y
buffer.put(getAsciiString(building.getPlanet().getName())); // home planet
}
buffer.put(getAsciiString("")); // Name of city player resides in
buffer.put(getAsciiString(player.getHome())); // Name of city player resides in
buffer.put(getUnicodeString(spouse));
buffer.putInt(creature.getPlayerObject().getLotsRemaining()); // lots remaining
buffer.putInt(player.getLotsRemaining()); // lots remaining
return buffer.flip();
}
src/services/housing/HousingService.java
+2 -1
View File
@@ -525,10 +525,11 @@ public class HousingService implements INetworkDispatch {
}
building.setResidency();
PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(building);
owner.setAttachment("residentCity", cityActorIsIn.getCityID());
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) {
owner.setAttachment("residentCity", cityActorIsIn.getCityID());
((CreatureObject) owner).getPlayerObject().setHome(cityActorIsIn.getCityName());
((CreatureObject) owner).getPlayerObject().setCitizenship(Citizenship.Citizen);
}