Fixed #336, Fixed #320, able to use basic dance

This commit is contained in:
Waverunner
2014-04-01 17:26:46 -04:00
parent 62a796a5a6
commit 57922d6892
9 changed files with 33 additions and 40 deletions
+7 -7
View File
@@ -200,17 +200,17 @@ public class ConnectionService implements INetworkDispatch {
if(object.getAttachment("inspireDuration") != null)
object.setAttachment("inspireDuration", null);
if(object.getInspirationTick() != null) {
object.getInspirationTick().cancel(true);
object.setInspirationTick(null);
if(object.getPerformanceListenee() != null) {
object.getPerformanceListenee().removeSpectator(object);
object.setPerformanceListenee(null);
}
if(object.getSpectatorTask() != null) {
object.getSpectatorTask().cancel(true);
object.setSpectatorTask(null);
if(object.getPerformanceWatchee() != null) {
object.getPerformanceWatchee().removeSpectator(object);
object.setPerformanceWatchee(null);
}
core.groupService.handleGroupDisband(object);
core.groupService.handleGroupDisband(object, false);
if (core.instanceService.isInInstance(object)) {
core.instanceService.remove(core.instanceService.getActiveInstance(object), object);