From 82679aae8a3a3d5e3ad71caa5eb526c9ddac2bd2 Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Fri, 14 Jul 2017 06:31:45 -0400 Subject: [PATCH] Kill players who log out during raids and force respawn players who die in raids --- .../clans/clans/worldevent/raid/RaidWorldEvent.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidWorldEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidWorldEvent.java index f3331ad5c..6903d35ab 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidWorldEvent.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidWorldEvent.java @@ -251,7 +251,8 @@ public abstract class RaidWorldEvent extends WorldEvent } if (_players.remove(event.getPlayer())) { - event.getPlayer().teleport(Spawn.getNorthSpawn()); + event.getPlayer().setHealth(0); + event.getPlayer().spigot().respawn(); } } @@ -264,13 +265,7 @@ public abstract class RaidWorldEvent extends WorldEvent } if (_players.remove(event.getEntity())) { - event.getEntity().setHealth(event.getEntity().getMaxHealth()); - getCondition().Clean(event.getEntity()); - event.getEntity().getActivePotionEffects().forEach(pe -> event.getEntity().removePotionEffect(pe.getType())); - event.getEntity().setExp(0); - event.getEntity().setLevel(0); - event.getEntity().setFireTicks(-1); - event.getEntity().teleport(Spawn.getNorthSpawn()); + Manager.runSyncLater(() -> event.getEntity().spigot().respawn(), 10); } }