From 1478879d5181c98b836e404b88f4022338da0b98 Mon Sep 17 00:00:00 2001 From: Treeku Date: Fri, 6 Jun 2014 18:48:49 +0100 Subject: [PATCH] Hopefully fixed #745 --- src/services/CharacterService.java | 2 +- src/services/gcw/GCWService.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java index b91ae9b4..8c2c1810 100644 --- a/src/services/CharacterService.java +++ b/src/services/CharacterService.java @@ -291,7 +291,7 @@ public class CharacterService implements INetworkDispatch { player.setProfession(clientCreateCharacter.getProfession()); player.setProfessionIcon(Professions.get(clientCreateCharacter.getProfession())); player.setProfessionWheelPosition(clientCreateCharacter.getProfessionWheelPosition()); - player.setNextUpdateTime(core.gcwService.calculateNextUpdateTime() + player.getBornDate()); + player.setNextUpdateTime(core.gcwService.calculateNextUpdateTime()); if(clientCreateCharacter.getHairObject().length() > 0) { String sharedHairTemplate = clientCreateCharacter.getHairObject().replace("/hair_", "/shared_hair_"); TangibleObject hair = (TangibleObject) core.objectService.createObject(sharedHairTemplate, object.getPlanet()); diff --git a/src/services/gcw/GCWService.java b/src/services/gcw/GCWService.java index 09ef5d79..a2b631d6 100644 --- a/src/services/gcw/GCWService.java +++ b/src/services/gcw/GCWService.java @@ -355,7 +355,7 @@ public class GCWService implements INetworkDispatch { player.setHighestImperialRank(player.getCurrentRank()); } - player.setNextUpdateTime(nextUpdateTime - player.getBornDate()); + player.setNextUpdateTime(nextUpdateTime); } } @@ -557,10 +557,11 @@ public class GCWService implements INetworkDispatch { player.setCurrentRank(newrank); player.setRankProgress((float) Math.floor(newprogress)); - if (newrank > oldrank) + if (newrank > oldrank) { core.scriptService.callScript("scripts/gcw/", "gcwrank_" + actor.getFaction(), "handleRankUp", actor, newrank); - else + } else { core.scriptService.callScript("scripts/gcw/", "gcwrank_" + actor.getFaction(), "handleRankDown", actor, newrank); + } } public List getSFPlayers() { @@ -660,7 +661,7 @@ public class GCWService implements INetworkDispatch { PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost"); - player.setNextUpdateTime(player.getBornDate() + calculateNextUpdateTime()); + player.setNextUpdateTime(calculateNextUpdateTime()); } cursor.close();