diff --git a/scripts/gcwzones.py b/scripts/gcwzones.py index d3256ec8..bd96b3a6 100644 --- a/scripts/gcwzones.py +++ b/scripts/gcwzones.py @@ -412,3 +412,5 @@ def addZones(core): gcwService.addZone('yavin4', 'yavin4_pve', 0, 0, 0, 0x07F88304, 0) gcwService.addZone('yavin4', 'yavin4_pvp', 0, 0, 0, 0x07F88304, 0) gcwService.addZone('yavin4', 'yavin4_pvp_battlefield', 0, 0, 0, 0x3663CE01, 0) + + \ No newline at end of file diff --git a/src/resources/objects/Buff.java b/src/resources/objects/Buff.java index f66d61a3..bcad87ef 100644 --- a/src/resources/objects/Buff.java +++ b/src/resources/objects/Buff.java @@ -21,7 +21,6 @@ ******************************************************************************/ package resources.objects; -import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; diff --git a/src/resources/objects/ObjectMessageBuilder.java b/src/resources/objects/ObjectMessageBuilder.java index d39f558d..b422edd9 100644 --- a/src/resources/objects/ObjectMessageBuilder.java +++ b/src/resources/objects/ObjectMessageBuilder.java @@ -115,7 +115,7 @@ public abstract class ObjectMessageBuilder { public SWGObject getObject() { return object; } public void setObject(SWGObject object) { this.object = object; } - public abstract void sendListDelta(byte viewType, short updateType, IoBuffer data); + public abstract void sendListDelta(byte viewType, short updateType, IoBuffer buffer); public abstract void sendBaselines(); diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java index 2fc7b875..d7608031 100644 --- a/src/resources/objects/creature/CreatureMessageBuilder.java +++ b/src/resources/objects/creature/CreatureMessageBuilder.java @@ -741,7 +741,7 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder { @Override - public void sendListDelta(byte viewType, short updateType, IoBuffer data) { + public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) { // TODO Auto-generated method stub } diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 52df5b26..5137d95d 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -747,6 +747,7 @@ public class CreatureObject extends TangibleObject implements IPersistent { } + @SuppressWarnings("unused") @Override public void sendBaselines(Client destination) { diff --git a/src/resources/objects/player/PlayerMessageBuilder.java b/src/resources/objects/player/PlayerMessageBuilder.java index 33f6db6e..82761dcc 100644 --- a/src/resources/objects/player/PlayerMessageBuilder.java +++ b/src/resources/objects/player/PlayerMessageBuilder.java @@ -535,7 +535,7 @@ public class PlayerMessageBuilder extends ObjectMessageBuilder { } @Override - public void sendListDelta(byte viewType, short updateType, IoBuffer data) { + public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) { // TODO Auto-generated method stub } diff --git a/src/resources/objects/tangible/TangibleMessageBuilder.java b/src/resources/objects/tangible/TangibleMessageBuilder.java index 11e97d03..b15e4bbd 100644 --- a/src/resources/objects/tangible/TangibleMessageBuilder.java +++ b/src/resources/objects/tangible/TangibleMessageBuilder.java @@ -124,7 +124,7 @@ public class TangibleMessageBuilder extends ObjectMessageBuilder { } @Override - public void sendListDelta(byte viewType, short updateType, IoBuffer data) { + public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) { // TODO Auto-generated method stub } diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index e8c231e7..157ef125 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -25,8 +25,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Vector; -import org.apache.mina.core.buffer.IoBuffer; - import resources.objects.creature.CreatureObject; diff --git a/src/resources/objects/weapon/WeaponMessageBuilder.java b/src/resources/objects/weapon/WeaponMessageBuilder.java index cca05d8b..6f3a3a1f 100644 --- a/src/resources/objects/weapon/WeaponMessageBuilder.java +++ b/src/resources/objects/weapon/WeaponMessageBuilder.java @@ -133,7 +133,7 @@ public class WeaponMessageBuilder extends ObjectMessageBuilder { } @Override - public void sendListDelta(byte viewType, short updateType, IoBuffer data) { + public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) { // TODO Auto-generated method stub } diff --git a/src/services/gcw/GCWService.java b/src/services/gcw/GCWService.java index 1ce0f1bf..c6ee30f4 100644 --- a/src/services/gcw/GCWService.java +++ b/src/services/gcw/GCWService.java @@ -80,7 +80,14 @@ public class GCWService implements INetworkDispatch { this.core = core; this.object = this.core.guildService.getGuildObject(); - core.scriptService.callScript("scripts/", "gcwzones", "addZones", core); + scheduler.schedule(new Runnable() { + @Override public void run() { afterInitialisation(); } + + private void afterInitialisation() { + core.scriptService.callScript("scripts/", "gcwzones", "addZones"); + } + + }, 1, TimeUnit.SECONDS); scheduler.scheduleAtFixedRate(new Runnable() { @Override public void run() { checkFactionalPresence(); } @@ -106,7 +113,7 @@ public class GCWService implements INetworkDispatch { } } } - }, 0, 3, TimeUnit.SECONDS); + }, 3, 3, TimeUnit.SECONDS); scheduler.scheduleAtFixedRate(new Runnable() { @Override public void run() { updateGCWZones(); } @@ -164,7 +171,7 @@ public class GCWService implements INetworkDispatch { } } } - }, 0, 1, TimeUnit.MINUTES); + }, 1, 1, TimeUnit.MINUTES); scheduler.scheduleAtFixedRate(new Runnable() { @Override public void run() { updateOtherGalaxiesGCWZones(); } @@ -191,7 +198,7 @@ public class GCWService implements INetworkDispatch { object.getOtherServerGCWZonePercentMap().replaceValues("SWG", galaxyWideZones); } } - }, 0, 15, TimeUnit.MINUTES); + }, 15, 15, TimeUnit.MINUTES); scheduler.scheduleAtFixedRate(new Runnable() { @Override public void run() { decrementZoneStrength(); } @@ -206,7 +213,7 @@ public class GCWService implements INetworkDispatch { } } } - }, 0, 1, TimeUnit.MINUTES); + }, 1, 1, TimeUnit.MINUTES); scheduler.scheduleAtFixedRate(new Runnable() { @Override public void run() { resetWeakGCWZones(); } diff --git a/src/services/guild/GuildService.java b/src/services/guild/GuildService.java index 304adf76..102748b0 100644 --- a/src/services/guild/GuildService.java +++ b/src/services/guild/GuildService.java @@ -26,19 +26,15 @@ import java.util.Map; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; -import protocol.swg.CmdSceneReady; - import resources.common.Opcodes; import resources.guild.Guild; import resources.objects.SWGList; -import resources.objects.creature.CreatureObject; import resources.objects.guild.GuildObject; import main.NGECore; import engine.clients.Client; import engine.resources.objects.SWGObject; -import engine.resources.scene.Point3D; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; @@ -125,15 +121,27 @@ public class GuildService implements INetworkDispatch { @Override public void insertOpcodes(Map swgOpcodes, Map objControllerOpcodes) { - swgOpcodes.put(Opcodes.CmdSceneReady, new INetworkRemoteEvent() { + swgOpcodes.put(Opcodes.ClientIdMsg, new INetworkRemoteEvent() { @Override public void handlePacket(IoSession session, IoBuffer data) throws Exception { Client client = core.getClient((Integer) session.getAttribute("connectionId")); - - // CmdSceneReady sceneReady = new CmdSceneReady(); - // client.getSession().write(sceneReady.serialize()); - + + if (client == null || client.getSession() == null) { + return; + } + + SWGObject object = client.getParent(); + + if (object == null) { + return; + } + + /* + object.sendCreate(client); + object.sendBaselines(client); + object.sendDestroy(client); + */ } });