From 78a34b15173d1fe71d91bc8c2351ccefbe4fc60e Mon Sep 17 00:00:00 2001
From: Chiss <ChristopherJozsa@gmail.com>
Date: Sat, 13 Dec 2014 11:55:12 +1100
Subject: [PATCH] hopefully fixed a bug where pumpking king despawned. removed
 11 disc from loot

---
 .../mineplex/core/reward/RewardManager.java   |  4 ++--
 .../games/christmas/content/PumpkinKing.java  |  2 ++
 .../game/games/christmas/parts/Part5.java     | 19 ++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
index 63133fb8f..f3f8c5df7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
@@ -176,8 +176,8 @@ public class RewardManager
 				new ItemStack(2264), rarity, 25));
 		addReward(new UnknownPackageReward(donationManager, "Ward Disc", "Ward Disc",
 				new ItemStack(2265), rarity, 25));
-		addReward(new UnknownPackageReward(donationManager, "11 Disc", "11 Disc",
-				new ItemStack(2266), rarity, 25));
+//		addReward(new UnknownPackageReward(donationManager, "11 Disc", "11 Disc",
+//				new ItemStack(2266), rarity, 25));
 		addReward(new UnknownPackageReward(donationManager, "Wait Disc", "Wait Disc",
 				new ItemStack(2267), rarity, 25));
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/PumpkinKing.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/PumpkinKing.java
index 2aa7cec98..67fe0adf5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/PumpkinKing.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/PumpkinKing.java
@@ -55,6 +55,8 @@ public class PumpkinKing
 		_ent.setCustomName("The Pumpkin King");
 		_ent.setCustomNameVisible(true);
 		
+		_ent.setRemoveWhenFarAway(false);
+		
 		_ent.getWorld().strikeLightningEffect(_ent.getLocation());
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java
index b35957420..d5211db82 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part5.java
@@ -16,6 +16,7 @@ import nautilus.game.arcade.game.games.christmas.ChristmasAudio;
 import nautilus.game.arcade.game.games.christmas.content.*;
 import net.minecraft.server.v1_7_R4.EntityCreature;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
@@ -192,12 +193,20 @@ public class Part5 extends Part
 			//Teleport
 			for (int i=0 ; i<Host.GetPlayers(true).size() ; i++)
 			{
-				Player player = Host.GetPlayers(true).get(i);
+				final Player player = Host.GetPlayers(true).get(i);
+				final int index = i;
 				
-				player.leaveVehicle();
-				
-				player.teleport(_playerSpawns.get(i%_playerSpawns.size()));
-				player.playSound(player.getLocation(), Sound.ZOMBIE_UNFECT, 2f, 1f);
+				Bukkit.getServer().getScheduler().runTaskLater(Host.Manager.GetPlugin(), new Runnable() 
+				{
+					@Override
+					public void run()
+					{
+						player.leaveVehicle();
+						
+						player.teleport(_playerSpawns.get(index%_playerSpawns.size()));
+						player.playSound(player.getLocation(), Sound.ZOMBIE_UNFECT, 2f, 1f);
+					}
+				}, i*2);
 			}
 		}
 		else if (_g && !_h && UtilTime.elapsed(_dialogueDelay, _delayTime - 1000))