diff --git a/src/network/packets/swg/login/LoginClusterStatus.java b/src/network/packets/swg/login/LoginClusterStatus.java
index bfc931a53..4e0405eea 100644
--- a/src/network/packets/swg/login/LoginClusterStatus.java
+++ b/src/network/packets/swg/login/LoginClusterStatus.java
@@ -1,30 +1,30 @@
/***********************************************************************************
-* Copyright (c) 2015 /// Project SWG /// www.projectswg.com *
-* *
-* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
-* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
-* Our goal is to create an emulator which will provide a server for players to *
-* continue playing a game similar to the one they used to play. We are basing *
-* it on the final publish of the game prior to end-game events. *
-* *
-* This file is part of Holocore. *
-* *
-* -------------------------------------------------------------------------------- *
-* *
-* Holocore is free software: you can redistribute it and/or modify *
-* it under the terms of the GNU Affero General Public License as *
-* published by the Free Software Foundation, either version 3 of the *
-* License, or (at your option) any later version. *
-* *
-* Holocore is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU Affero General Public License for more details. *
-* *
-* You should have received a copy of the GNU Affero General Public License *
-* along with Holocore. If not, see . *
-* *
-***********************************************************************************/
+ * Copyright (c) 2015 /// Project SWG /// www.projectswg.com *
+ * *
+ * ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
+ * July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
+ * Our goal is to create an emulator which will provide a server for players to *
+ * continue playing a game similar to the one they used to play. We are basing *
+ * it on the final publish of the game prior to end-game events. *
+ * *
+ * This file is part of Holocore. *
+ * *
+ * -------------------------------------------------------------------------------- *
+ * *
+ * Holocore is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU Affero General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * Holocore is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU Affero General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Affero General Public License *
+ * along with Holocore. If not, see . *
+ * *
+ ***********************************************************************************/
package network.packets.swg.login;
import java.nio.ByteBuffer;
@@ -71,24 +71,24 @@ public class LoginClusterStatus extends SWGPacket {
public ByteBuffer encode() {
int length = 10;
for (Galaxy g : galaxies)
- length += 35 + g.getAddress().length() + 8;
+ length += 39 + g.getAddress().length();
ByteBuffer data = ByteBuffer.allocate(length);
addShort(data, 2);
addInt( data, CRC);
addInt( data, galaxies.size());
for (Galaxy g : galaxies) {
- addInt( data, g.getId());
- addAscii( data, g.getAddress());
- addShort( data, g.getZonePort());
- addShort( data, g.getPingPort());
- addInt( data, g.getPopulation());
- addInt( data, g.getPopulationStatus());
- addInt( data, g.getMaxCharacters());
- addInt( data, g.getDistance());
- addInt( data, g.getStatus().getStatus());
- addBoolean(data, g.isRecommended());
- addInt( data, g.getOnlinePlayerLimit());
- addInt( data, g.getOnlineFreeTrialLimit());
+ addInt( data, g.getId());
+ addAscii( data, g.getAddress());
+ addShort( data, g.getZonePort());
+ addShort( data, g.getPingPort());
+ addInt( data, g.getPopulation());
+ addInt( data, g.getPopulationStatus());
+ addInt( data, g.getMaxCharacters());
+ addInt( data, g.getDistance());
+ addInt( data, g.getStatus().getStatus());
+ addBoolean(data, g.isRecommended());
+ addInt( data, g.getOnlinePlayerLimit());
+ addInt( data, g.getOnlineFreeTrialLimit());
}
return data;
}
diff --git a/src/services/player/PlayerManager.java b/src/services/player/PlayerManager.java
index 7e1f58119..e2716f74f 100644
--- a/src/services/player/PlayerManager.java
+++ b/src/services/player/PlayerManager.java
@@ -39,7 +39,6 @@ import intents.NotifyPlayersPacketIntent;
import intents.PlayerEventIntent;
import intents.network.ConnectionClosedIntent;
import intents.network.ConnectionOpenedIntent;
-import intents.network.GalacticPacketIntent;
import resources.Terrain;
import resources.control.Intent;
import resources.control.Manager;
@@ -62,7 +61,6 @@ public class PlayerManager extends Manager {
addChildService(loginService);
addChildService(zoneService);
- registerForIntent(GalacticPacketIntent.TYPE);
registerForIntent(PlayerEventIntent.TYPE);
registerForIntent(NotifyPlayersPacketIntent.TYPE);
registerForIntent(ConnectionOpenedIntent.TYPE);