projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-07-13 20:00:58 -04:00
Code Issues Projects Releases Wiki Activity

Changed Holocore to be limited to a single galaxy

Browse Source
This commit is contained in:
Obique PSWG
2016-01-06 21:49:29 -06:00
parent 8f66a19627
commit f968e0dfc7
21 changed files with 155 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+3 -4
View File
@@ -230,9 +230,8 @@ public class ObjectManager extends Manager {
Packet packet = gpi.getPacket();
if (packet instanceof SelectCharacter) {
PlayerManager pm = gpi.getPlayerManager();
String galaxy = gpi.getGalaxy().getName();
long characterId = ((SelectCharacter) packet).getCharacterId();
zoneInCharacter(pm, galaxy, gpi.getNetworkId(), characterId);
zoneInCharacter(pm, gpi.getNetworkId(), characterId);
}
}
@@ -342,7 +341,7 @@ public class ObjectManager extends Manager {
}
}
private void zoneInCharacter(PlayerManager playerManager, String galaxy, long netId, long characterId) {
private void zoneInCharacter(PlayerManager playerManager, long netId, long characterId) {
Player player = playerManager.getPlayerFromNetworkId(netId);
if (player == null) {
Log.e("ObjectManager", "Unable to zone in null player '%d'", netId);
@@ -367,7 +366,7 @@ public class ObjectManager extends Manager {
sendClientFatal(player, "Failed to zone", "There has been an internal server error: Null Ghost.\nPlease delete your character and create a new one", 10, TimeUnit.SECONDS);
return;
}
new RequestZoneInIntent(player, (CreatureObject) creatureObj, galaxy).broadcast();
new RequestZoneInIntent(player, (CreatureObject) creatureObj, true).broadcast();
}
private void sendClientFatal(Player player, String title, String message, long timeToRead, TimeUnit time) {