From 1801ac5cae7336ffbe658edc926cc2c426936d02 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sun, 16 Mar 2014 14:01:32 -0400 Subject: [PATCH] Minor fix to packet being sent --- src/services/EntertainmentService.java | 4 ++-- src/services/collections/CollectionService.java | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java index 1732727b..f82cb731 100644 --- a/src/services/EntertainmentService.java +++ b/src/services/EntertainmentService.java @@ -172,10 +172,10 @@ public class EntertainmentService implements INetworkDispatch { endRecipient.setObjectId(buffRecipient.getObjectId()); ObjControllerMessage closeBuilder = new ObjControllerMessage(0x0B, endBuilder); - session.write(closeBuilder.serialize()); + buffer.getClient().getSession().write(closeBuilder.serialize()); ObjControllerMessage closeRecipient = new ObjControllerMessage(0x0B, endRecipient); - session.write(closeRecipient.serialize()); + buffRecipient.getClient().getSession().write(closeRecipient.serialize()); } else if (sentPacket.getAccepted() == true && sentPacket.getBuffRecipientAccepted() == 0) { changeMessage.setAccepted(true); diff --git a/src/services/collections/CollectionService.java b/src/services/collections/CollectionService.java index 025307e5..15567a6b 100644 --- a/src/services/collections/CollectionService.java +++ b/src/services/collections/CollectionService.java @@ -71,7 +71,7 @@ public class CollectionService implements INetworkDispatch { } } - /* + /** * @see datatables/collection/collections.iff * * Count and exploration count badges are added automatically. @@ -417,7 +417,7 @@ public class CollectionService implements INetworkDispatch { return false; } - /* + /** * @param creature The player's CreatureObject instance. * @param collection slotName or collectionName from collection.iff. * @@ -497,7 +497,7 @@ public class CollectionService implements INetworkDispatch { return false; } - /* + /** * Returns number of completed bits in a slot or the number of completed * slots in a collection, page or book. * @@ -623,7 +623,8 @@ public class CollectionService implements INetworkDispatch { return 0; } - /* + + /** * Registers an exploration badge location. * * @param planet Name from Planet.getName(). @@ -640,7 +641,7 @@ public class CollectionService implements INetworkDispatch { explorationLocations.get(planet).put(badgeName, new ExplorationRegion(new Point3D(x, 0, z), range)); } - /* + /** * Checks if the player is in range of any exploration regions * and grants any ungranted badges. * @@ -660,7 +661,7 @@ public class CollectionService implements INetworkDispatch { } } - /* + /** * Clears the specified slot, collection, page or book. * * @param creature The player's CreatureObject instance. @@ -749,7 +750,7 @@ public class CollectionService implements INetworkDispatch { return false; } - /* + /** * Clears all collections. * * This must cycle through all the collections because