Fixed merge conflicts

Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimationPoint.java

@@ -54,5 +54,4 @@ public class AnimationPoint
 	{
 		return Objects.hash(_tick, _move);
 	}
-
 }

Plugins/Mineplex.Core.Common/src/mineplex/core/common/lang/IntlString.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
@@ -154,7 +155,7 @@ public class IntlString
 	@Override
 	public int hashCode()
 	{
-		return toString().hashCode();
+		return Objects.hash(getKey(), getArguments());
 	}
 
 	@Override
@@ -220,7 +221,7 @@ public class IntlString
 		@Override
 		public int hashCode()
 		{
-			return toString().hashCode();
+			return Objects.hash(getArgument(), getStyle());
 		}
 
 		@Override

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/PlayerMap.java

@@ -1,15 +1,7 @@
 package mineplex.core.common.util;
 
-import com.google.common.collect.Sets;
-import org.apache.commons.lang3.Validate;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import javax.annotation.Nonnull;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -17,12 +9,21 @@ import java.util.UUID;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.annotation.Nonnull;
+
+import org.apache.commons.lang3.Validate;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
 public class PlayerMap<V> implements Map<UUID, V>
 {
 	private static final Object LOCK = new Object();
 
 	private static final RemovalListener REMOVAL_LISTENER = new RemovalListener();
-	private static final Set<PlayerMap<?>> ALL_PLAYER_MAPS = Sets.newSetFromMap(new WeakHashMap<>());
+	private static final Set<PlayerMap<?>> ALL_PLAYER_MAPS = Collections.newSetFromMap(new WeakHashMap<>());
 
 	static
 	{

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java

@@ -99,4 +99,10 @@ public class ItemFleshHook extends ItemGadget implements IThrown
 	{
 		data.getThrown().remove();
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java

@@ -182,6 +182,12 @@ public class ItemFreezeCannon extends ItemGadget implements IThrown
 		smash(data.getThrown());
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+	
 	public void smash(Entity ent)
 	{	
 		//Effect
@@ -190,5 +196,4 @@ public class ItemFreezeCannon extends ItemGadget implements IThrown
 		//Remove
 		ent.remove();
 	}
-
 }

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java

@@ -101,6 +101,12 @@ public class ItemMelonLauncher extends ItemGadget implements IThrown
 		smash(data.getThrown());
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+	
 	public void smash(Entity ent)
 	{	
 		//Effect

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java

@@ -108,6 +108,12 @@ public class ItemPartyPopper extends ItemGadget implements IThrown
 		Explode(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+	
 	@EventHandler
 	public void particleTrail(UpdateEvent event)
 	{

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java

@@ -153,6 +153,12 @@ public class MorphBat extends MorphGadget implements IThrown
 		data.getThrown().remove();
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void Flap(PlayerToggleFlightEvent event)
 	{

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java

@@ -156,4 +156,9 @@ public class MorphSquid extends MorphGadget implements IThrown
 		data.getThrown().remove();
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java

@@ -142,6 +142,12 @@ public class MorphVillager extends MorphGadget implements IThrown
 
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void Pickup(PlayerPickupItemEvent event)
 	{

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java

@@ -81,7 +81,6 @@ public class ParticleCandyCane extends ParticleGadget
 	{
 		Double y = _map.get(p.getUniqueId());
 		if (y == null) return 3;
-		return y.doubleValue();
+		return y;
 	}
-
 }

Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java

@@ -71,7 +71,7 @@ public class GiveItemCommand extends CommandBase<InventoryManager>
 				{
 					Plugin.addItemToInventoryForOffline(success ->
 					{
-						if (success.booleanValue())
+						if (success)
 						{
 							UtilPlayer.message(caller, F.main("Item", "You gave " + F.elem(amount + " " + itemName) + " to offline player " + F.name(playerName)));
 						}

Plugins/Mineplex.Core/src/mineplex/core/loot/RandomItem.java

@@ -59,4 +59,10 @@ public class RandomItem
 			
 		return _item.getType() == item.getItemStack().getType();
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return _item.getType().hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/poll/Poll.java

@@ -70,4 +70,10 @@ public class Poll
 		}
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Integer.hashCode(getId());
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/portal/commands/SendCommand.java

@@ -38,7 +38,7 @@ public class SendCommand extends CommandBase<Portal>
 
 				Plugin.doesServerExist(serverTarget, serverExists ->
 				{
-					if (!serverExists.booleanValue())
+					if (!serverExists)
 					{
 						UtilPlayer.message(player, F.main(Plugin.getName(), C.cGray + "Server " + C.cGold + serverTarget + C.cGray + " does not exist!"));
 						return;

Plugins/Mineplex.Core/src/mineplex/core/portal/commands/ServerCommand.java

@@ -39,7 +39,7 @@ public class ServerCommand extends CommandBase<Portal>
 			{
 				Plugin.doesServerExist(args[0], serverExists ->
 				{
-					if (!serverExists.booleanValue())
+					if (!serverExists)
 					{
 						UtilPlayer.message(
 								player,

Plugins/Mineplex.Core/src/mineplex/core/projectile/IThrown.java

@@ -9,4 +9,5 @@ public interface IThrown
 	public void Collide(LivingEntity target, Block block, ProjectileUser data);
 	public void Idle(ProjectileUser data);
 	public void Expire(ProjectileUser data);
+	public void ChunkUnload(ProjectileUser data);
 }

Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java

@@ -5,11 +5,6 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.WeakHashMap;
 
-import mineplex.core.MiniPlugin;
-import mineplex.core.common.util.UtilParticle.ParticleType;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-
 import org.bukkit.Effect;
 import org.bukkit.Sound;
 import org.bukkit.entity.Entity;
@@ -19,8 +14,14 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.InventoryPickupItemEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.world.ChunkUnloadEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+
 public class ProjectileManager extends MiniPlugin
 {
 	private WeakHashMap<Entity, ProjectileUser> _thrown = new WeakHashMap<Entity, ProjectileUser>();
@@ -212,4 +213,16 @@ public class ProjectileManager extends MiniPlugin
 		if (_thrown.containsKey(event.getItem()))
 			event.setCancelled(true);
 	}
+	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	public void chunkUnload(ChunkUnloadEvent event)
+	{
+		for (Entity e : event.getChunk().getEntities())
+		{
+			if (_thrown.containsKey(e))
+			{
+				_thrown.get(e).chunkUnload();
+			}
+		}
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java

@@ -2,6 +2,18 @@ package mineplex.core.projectile;
 
 import java.util.List;
 
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilParticle.ParticleType;
@@ -16,19 +28,6 @@ import net.minecraft.server.v1_8_R3.MathHelper;
 import net.minecraft.server.v1_8_R3.MovingObjectPosition;
 import net.minecraft.server.v1_8_R3.Vec3D;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Effect;
-import org.bukkit.GameMode;
-import org.bukkit.Sound;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-
 public class ProjectileUser 
 {
 	public ProjectileManager Throw;
@@ -186,6 +185,10 @@ public class ProjectileUser
 		_canHit = canHit;
 	}
 	
+	public void chunkUnload()
+	{
+		_callback.ChunkUnload(this);
+	}
 
 	public void effect(UpdateEvent event)
 	{

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/ChestReward.java

@@ -77,4 +77,10 @@ public class ChestReward extends Reward
 		}
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return _type.getName().hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/GameAmplifierReward.java

@@ -75,4 +75,10 @@ public class GameAmplifierReward extends Reward
 		}
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return getClass().hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/GemReward.java

@@ -7,7 +7,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.common.currency.GlobalCurrency;
-import mineplex.core.common.util.Callback;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.reward.Reward;
 import mineplex.core.reward.RewardData;
@@ -66,4 +65,10 @@ public class GemReward extends Reward
 
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return getClass().hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/InventoryReward.java

@@ -11,9 +11,6 @@ import mineplex.core.reward.RewardData;
 import mineplex.core.reward.RewardRarity;
 import mineplex.core.reward.RewardType;
 
-/**
- * Created by shaun on 14-09-12.
- */
 public class InventoryReward extends Reward
 {
 	private Random _random;
@@ -88,4 +85,10 @@ public class InventoryReward extends Reward
 		}
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return _packageName.hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/PowerPlayReward.java

@@ -65,4 +65,10 @@ public class PowerPlayReward extends Reward
 		}
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return getClass().hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/RankReward.java

@@ -110,4 +110,10 @@ public class RankReward extends Reward
 
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return getClass().hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/RuneAmplifierReward.java

@@ -75,4 +75,10 @@ public class RuneAmplifierReward extends Reward
 		}
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Integer.hashCode(_minutes);
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/SpinTicketReward.java

@@ -119,4 +119,10 @@ public class SpinTicketReward extends Reward
 		}
 		return false;
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return getClass().hashCode();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/TreasureShardReward.java

@@ -1,16 +1,14 @@
 package mineplex.core.reward.rewards;
 
-import mineplex.core.account.CoreClient;
-import mineplex.core.account.CoreClientManager;
-import mineplex.core.common.currency.GlobalCurrency;
-import mineplex.core.common.util.UtilMath;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import mineplex.core.common.util.Callback;
+import mineplex.core.account.CoreClient;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.currency.GlobalCurrency;
+import mineplex.core.common.util.UtilMath;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.reward.Reward;
 import mineplex.core.reward.RewardData;
@@ -99,5 +97,10 @@ public class TreasureShardReward extends Reward
 
 		return false;
 	}
-}
 	
+	@Override
+	public int hashCode()
+	{
+		return getClass().hashCode();
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java

@@ -116,6 +116,12 @@ public class UnknownPackageReward extends Reward
 		return false;
 	}
 	
+	@Override
+	public int hashCode()
+	{
+		return _packageName.hashCode();
+	}
+
 	public String getHeader()
 	{
 		return _header;

Plugins/Mineplex.Core/src/mineplex/core/shop/item/ShopItem.java

@@ -129,12 +129,6 @@ public class ShopItem extends ItemStack
 		return new ShopItem(super.clone(), _name, _deliveryName, _deliveryAmount, _locked, _displayItem);
 	}
 
-	@Override
-	public boolean equals(Object obj) 
-	{
-		return super.equals(obj);
-	}
-
 	protected void UpdateVisual(boolean clone)
 	{
         ItemMeta meta = getItemMeta();

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java

@@ -9,7 +9,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniPlugin;
 import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.game.clans.clans.ClanTips.TipType;
@@ -61,7 +60,7 @@ public class ClanEnergyTracker extends MiniPlugin
 		
 		Triple<Long, Long, String[]> energyBounds = _updateMap.get(type);
 		
-		if (energyBounds != null && energyRemaining > energyBounds.getLeft().longValue() && energyRemaining < energyBounds.getMiddle().longValue())
+		if (energyBounds != null && energyRemaining > energyBounds.getLeft() && energyRemaining < energyBounds.getMiddle())
 		{
 			_clans.middleTextClan(clan, energyBounds.getRight()[0], energyBounds.getRight()[1], 20, 200, 80);
 			_clans.sendTipToClan(clan, TipType.ENERGY);

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java

@@ -751,7 +751,7 @@ public class ClansDataAccessLayer
 					{
 						if (callback != null)
 						{
-							callback.run(Boolean.valueOf(ran));
+							callback.run(ran);
 						}
 						else
 						{

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java

@@ -879,9 +879,9 @@ public class ClansUtility
 		// Claim Timer
 		if (_clansManager.getUnclaimMap().containsKey(chunk))
 		{
-			if (!UtilTime.elapsed(_clansManager.getUnclaimMap().get(chunk).longValue(), _clansManager.getReclaimTime()))
+			if (!UtilTime.elapsed(_clansManager.getUnclaimMap().get(chunk), _clansManager.getReclaimTime()))
 			{
-				UtilPlayer.message(caller, F.main("Clans", "This Territory cannot be claimed for " + F.time(UtilTime.convertString(_clansManager.getReclaimTime() - (System.currentTimeMillis() - _clansManager.getUnclaimMap().get(chunk).longValue()), 1, UtilTime.TimeUnit.FIT)) + "."));
+				UtilPlayer.message(caller, F.main("Clans", "This Territory cannot be claimed for " + F.time(UtilTime.convertString(_clansManager.getReclaimTime() - (System.currentTimeMillis() - _clansManager.getUnclaimMap().get(chunk)), 1, UtilTime.TimeUnit.FIT)) + "."));
 				
 				return false;
 			}

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/mounts/MountManager.java

@@ -332,7 +332,7 @@ public class MountManager extends MiniDbClientPlugin<MountOwnerData>
 					if (UtilEnt.GetMetadata(entry.getKey(), "DISMOUNT_TIME") != null)
 					{
 						Long dismount = UtilEnt.GetMetadata(entry.getKey(), "DISMOUNT_TIME");
-						if (UtilTime.elapsed(dismount.longValue(), MAX_TIME_DISMOUNTED))
+						if (UtilTime.elapsed(dismount, MAX_TIME_DISMOUNTED))
 						{
 							mountIterator.remove();
 							entry.getValue().despawn(false);

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java

@@ -135,4 +135,10 @@ public class PotatoManager extends MiniPlugin implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java

@@ -119,7 +119,7 @@ public class OutpostRepository extends RepositoryBase
 	public void updateOutpost(OutpostToken token)
 	{
 		executeUpdate(UPDATE_OUTPOST,
-				new ColumnByte("outpostState", Byte.valueOf(token.OutpostState.getId())),
+				new ColumnByte("outpostState", token.OutpostState.getId()),
 				new ColumnInt("uniqueId", token.UniqueId));
 	}
 
@@ -132,6 +132,6 @@ public class OutpostRepository extends RepositoryBase
 				new ColumnInt("outpostType", token.Type.getId()),
 				new ColumnInt("ownerClan", token.OwnerClan.getId()),
 				new ColumnTimestamp("timeSpawned", new Timestamp(token.TimeSpawned)),
-				new ColumnByte("outpostState", Byte.valueOf(token.OutpostState.getId())));
+				new ColumnByte("outpostState", token.OutpostState.getId()));
 	}
 }

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/boss/ironwizard/abilities/IronHook.java

@@ -51,4 +51,10 @@ public class IronHook implements IThrown
 	{
 		data.getThrown().remove();
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidWorldEvent.java

@@ -313,4 +313,10 @@ public abstract class RaidWorldEvent extends WorldEvent
 		
 		return ((RaidWorldEvent)object).getId() == getId();
 	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Integer.hashCode(getId());
+	}
 }

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearPage.java

@@ -289,7 +289,7 @@ public class GearPage extends ShopPageBase<GearManager, GearShop>
 		if (_factory == null || _factory.getItemType() == null)
 		{
 			performBack();
-			return Triple.of(Boolean.valueOf(true), stageTitle, stageMaterial);
+			return Triple.of(true, stageTitle, stageMaterial);
 		}
 		
 		if (_factory.getItemType().equals(ItemType.RARE))
@@ -429,7 +429,7 @@ public class GearPage extends ShopPageBase<GearManager, GearShop>
 				}
 			}
 		}
-		return Triple.of(Boolean.valueOf($return), stageTitle, stageMaterial);
+		return Triple.of($return, stageTitle, stageMaterial);
 	}
 	
 	private Triple<Boolean, String, Material> doStageThree() throws InstantiationException, IllegalAccessException
@@ -439,7 +439,7 @@ public class GearPage extends ShopPageBase<GearManager, GearShop>
 		if (_factory.getMaterial() == null)
 		{
 			performBack();
-			return Triple.of(Boolean.valueOf(true), null, null);
+			return Triple.of(true, null, null);
 		}
 		
 		Material stageMaterial = _factory.getMaterial();
@@ -535,7 +535,7 @@ public class GearPage extends ShopPageBase<GearManager, GearShop>
 			}
 		}
 		
-		return Triple.of(Boolean.valueOf(false), stageTitle, stageMaterial);
+		return Triple.of(false, stageTitle, stageMaterial);
 	}
 	
 	private Pair<String, Material> doStageFour() throws InstantiationException, IllegalAccessException

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java

@@ -1,6 +1,7 @@
 package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.attackenemy;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
@@ -11,7 +12,6 @@ import org.bukkit.entity.Zombie;
 import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.fallingblock.FallingBlocks;
@@ -64,7 +64,7 @@ public class BlowUpWallGoal extends ObjectiveGoal<AttackEnemyObjective>
 		
 		double radius = 5.2;
 		
-		HashMap<Block, Double> blockList = new HashMap<Block, Double>();
+		Map<Block, Double> blockList = new HashMap<>();
 		int iR = (int) radius + 1;
 		
 		for (int x = -iR; x <= iR; x++)
@@ -91,7 +91,7 @@ public class BlowUpWallGoal extends ObjectiveGoal<AttackEnemyObjective>
 		     || block.getType() == Material.SMOOTH_STAIRS
 		     || block.getType() == Material.IRON_DOOR_BLOCK)
 			
-			if (Math.random() < 0.2 + (dist.doubleValue() / 2.55) || dist.doubleValue() < 1.75)
+			if (Math.random() < 0.2 + (dist / 2.55) || dist < 1.75)
 			{
 				block.setType(Material.AIR, false);
 				

Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsAddCommand.java

@@ -48,7 +48,7 @@ public class NewsAddCommand extends CommandBase<HubManager>
 			
 			newsMang.AddNewsEntry(entry, success ->
 			{
-				if (success.booleanValue())
+				if (success)
 				{
 					UtilPlayer.message(caller, F.main(Plugin.getName(), C.cGray + "The news entry: " + C.cGold + entry + C.cGray + " has been added to the database!"));
 				}

Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsDeleteCommand.java

@@ -39,7 +39,7 @@ public class NewsDeleteCommand extends CommandBase<HubManager>
 			}
 			newsMang.DeleteNewsEntry(newsPosition, success ->
 			{
-				if (success.booleanValue())
+				if (success)
 				{							
 					UtilPlayer.message(caller, F.main(Plugin.getName(), C.cGray + "The news entry at position " + C.cGold + newsPosition + C.cGray + " has been deleted!"));
 				}

Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsListCommand.java

@@ -33,7 +33,7 @@ public class NewsListCommand extends CommandBase<HubManager>
 				// Order newsEntries set or its output by newsPosition, not hash order...
 				newsMang.RetrieveMaxNewsPosition(maxPosition ->
 				{
-					String[] newsStrings = new String[maxPosition.intValue()];
+					String[] newsStrings = new String[maxPosition];
 					for (Iterator<String> iterator = entries.keySet().iterator(); iterator.hasNext();)
 					{
 						String newsPosition = iterator.next();							

Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsSetCommand.java

@@ -58,7 +58,7 @@ public class NewsSetCommand extends CommandBase<HubManager>
 			
 			newsMang.SetNewsEntry(entry, newsPosition, success ->
 			{
-				if (success.booleanValue())
+				if (success)
 				{
 					UtilPlayer.message(caller, F.main(Plugin.getName(), C.cGray + "The news entry at position " + C.cGold + newsPosition + C.cGray + " has been updated to: " + C.cGold + entry + C.cGray + "!"));
 				}

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java

@@ -450,6 +450,12 @@ public class BlockToss extends SkillCharge implements IThrown
 		}
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@Override
 	public void Reset(Player player) 
 	{

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java

@@ -180,4 +180,10 @@ public class FleshHook extends SkillActiveCharge implements IThrown
 		//Remove
 		data.getThrown().remove();
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java

@@ -226,4 +226,10 @@ public class AxeThrow extends SkillActive implements IThrown
 			}
 		}
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java

@@ -147,4 +147,10 @@ public class FreezingBlast extends SkillActive implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java

@@ -119,4 +119,10 @@ public class GlacialBlade extends SkillActive implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java

@@ -193,4 +193,10 @@ public class IcePrison extends SkillActive implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java

@@ -199,4 +199,10 @@ public class LightningOrb extends SkillActive implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java

@@ -9,7 +9,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -45,7 +44,7 @@ public class VitalitySpores extends Skill
 			}
 			else
 			{
-				_lastDamage.put(event.GetDamageePlayer(), Long.valueOf(System.currentTimeMillis()));
+				_lastDamage.put(event.GetDamageePlayer(), System.currentTimeMillis());
 			}
 		}
 	}
@@ -63,7 +62,7 @@ public class VitalitySpores extends Skill
 	    {
 	    	Entry<Player, Long> entry = iterator.next();
 	    	
-			if (UtilTime.elapsed(entry.getValue().longValue(), 10000))
+			if (UtilTime.elapsed(entry.getValue(), 10000))
 			{
 				iterator.remove();
 				entry.getKey().addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, (20 * (5 + getLevel(entry.getKey()))), 1));

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Consume/Apple.java

@@ -81,4 +81,10 @@ public class Apple extends ItemUsable
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Consume/Soup.java

@@ -68,4 +68,10 @@ public class Soup extends ItemUsable
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Pistol.java

@@ -188,4 +188,10 @@ public class Pistol extends ItemUsable
 	{
 		
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/PoisonBall.java

@@ -72,4 +72,10 @@ public class PoisonBall extends ItemUsable
 		if (ent instanceof Item)
 			((Item)ent).setPickupDelay(5);
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityExplosive.java

@@ -2,6 +2,7 @@ package mineplex.minecraft.game.classcombat.item.Throwable;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Effect;
@@ -18,27 +19,28 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.inventory.InventoryPickupItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.world.ChunkUnloadEvent;
 
-import mineplex.core.projectile.ProjectileUser;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilEnt;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.projectile.ProjectileUser;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.classcombat.item.ItemFactory;
 import mineplex.minecraft.game.classcombat.item.ItemUsable;
 import mineplex.minecraft.game.classcombat.item.event.ProximityUseEvent;
 
 public class ProximityExplosive extends ItemUsable
 {
-	private HashMap<Entity, LivingEntity> _armed = new HashMap<Entity, LivingEntity>();
+	private Map<Entity, LivingEntity> _armed = new HashMap<>();
 	
 	public ProximityExplosive(ItemFactory factory, Material type,
 			int amount, boolean canDamage, int gemCost, int tokenCost,
@@ -185,5 +187,22 @@ public class ProximityExplosive extends ItemUsable
 			}
 		}	
 	}
-}
 	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	public void chunkUnload(ChunkUnloadEvent event)
+	{
+		for (Entity e : event.getChunk().getEntities())
+		{
+			if (_armed.remove(e) != null)
+			{
+				e.remove();
+			}
+		}
+	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+}

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityManager.java

@@ -4,15 +4,10 @@ import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.minecraft.game.classcombat.item.event.ProximityUseEvent;
-
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -20,11 +15,18 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.classcombat.item.event.ProximityUseEvent;
+
 public class ProximityManager implements Listener
 {
 	private int _proxyLimit = 6;
 
-	private HashMap<Player, ArrayList<Entry<String, Entity>>> _proxyMap = new HashMap<Player, ArrayList<Entry<String, Entity>>>();
+	private Map<Player, List<Entry<String, Entity>>> _proxyMap = new HashMap<>();
 	
 	public void setProxyLimit(int limit)
 	{
@@ -41,7 +43,7 @@ public class ProximityManager implements Listener
 		if (!_proxyMap.containsKey(event.getPlayer()))
 			_proxyMap.put(event.getPlayer(), new ArrayList<Entry<String,Entity>>());
 		
-		ArrayList<Entry<String, Entity>> proxies = _proxyMap.get(event.getPlayer());
+		List<Entry<String, Entity>> proxies = _proxyMap.get(event.getPlayer());
 		
 		//Store New
 		proxies.add(new AbstractMap.SimpleEntry<String, Entity>(event.getItemType().GetName(), event.getEntity()));
@@ -79,7 +81,7 @@ public class ProximityManager implements Listener
 				continue;
 			}
 			
-			ArrayList<Entry<String,Entity>> proxies = _proxyMap.get(player);
+			List<Entry<String,Entity>> proxies = _proxyMap.get(player);
 			
 			Iterator<Entry<String,Entity>> proxyIter = proxies.iterator();
 			

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/ProximityZapper.java

@@ -2,6 +2,7 @@ package mineplex.minecraft.game.classcombat.item.Throwable;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Effect;
@@ -17,25 +18,26 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.InventoryPickupItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.world.ChunkUnloadEvent;
 
-import mineplex.core.projectile.ProjectileUser;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.projectile.ProjectileUser;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.classcombat.item.ItemFactory;
 import mineplex.minecraft.game.classcombat.item.ItemUsable;
 import mineplex.minecraft.game.classcombat.item.event.ProximityUseEvent;
 
 public class ProximityZapper extends ItemUsable
 {
-	private HashMap<Entity, LivingEntity> _armed = new HashMap<Entity, LivingEntity>();
+	private Map<Entity, LivingEntity> _armed = new HashMap<>();
 
 	public ProximityZapper(ItemFactory factory, Material type,
 			int amount, boolean canDamage, int gemCost, int tokenCost,
@@ -178,5 +180,22 @@ public class ProximityZapper extends ItemUsable
 			}
 		}	
 	}
-}
 	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	public void chunkUnload(ChunkUnloadEvent event)
+	{
+		for (Entity e : event.getChunk().getEntities())
+		{
+			if (_armed.remove(e) != null)
+			{
+				e.remove();
+			}
+		}
+	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+}

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/WaterBottle.java

@@ -77,6 +77,12 @@ public class WaterBottle extends ItemUsable
 		Break(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	public void Break(ProjectileUser data)
 	{
 		//Splash

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java

@@ -69,6 +69,12 @@ public class Web extends ItemUsable
 		CreateWeb(data.getThrown());
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+	
 	public void CreateWeb(Entity ent)
 	{
 		LivingEntity thrower = Factory.Throw().getThrower(ent);

Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/broodmother/attacks/SpiderPoison.java

@@ -63,4 +63,9 @@ public class SpiderPoison implements IThrown
 		burst(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/IronHook.java

@@ -51,4 +51,10 @@ public class IronHook implements IThrown
 	{
 		data.getThrown().remove();
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/slimeking/ability/RocketAbility.java

@@ -133,6 +133,12 @@ public class RocketAbility extends SlimeAbility implements IThrown
 		_rocketsHit++;
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	private static class ShotData
 	{
 		private LivingEntity _entity;

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java

@@ -1259,7 +1259,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		UtilPlayer.setGliding(player, false);
 		UtilPlayer.setAutoDeployDistance(player, 1.15F);
 
-		((CraftEntity) player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0), EntityLiving.META_ENTITYDATA, (byte) 0);
+		((CraftEntity) player).getHandle().getDataWatcher().watch(0, (byte) 0, EntityLiving.META_ENTITYDATA, (byte) 0);
 
 		player.setCustomName("");
 		player.setCustomNameVisible(false);

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkBlockTossEVO.java

@@ -205,6 +205,11 @@ public class PerkBlockTossEVO extends Perk implements IThrown
 
 	}	
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 
 	@SuppressWarnings("deprecation")
 	@EventHandler

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkSulphurBombEVO.java

@@ -120,6 +120,12 @@ public class PerkSulphurBombEVO extends Perk implements IThrown
 		Explode(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	public void Explode(ProjectileUser data)
 	{
 		UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, data.getThrown().getLocation(), 0, 0, 0, 0, 1,
@@ -136,5 +142,4 @@ public class PerkSulphurBombEVO extends Perk implements IThrown
 
 		event.AddKnockback(GetName(), 1.5);
 	}	
-	
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/perks/PerkWebEVO.java

@@ -110,6 +110,12 @@ public class PerkWebEVO extends Perk implements IThrown
 		Web(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+	
 	public void Web(ProjectileUser data)
 	{
 		Location loc = data.getThrown().getLocation();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java

@@ -82,7 +82,7 @@ public class BlockForm extends Form
 		}
 
 		EntityPlayer player = ((CraftPlayer) Player).getHandle();
-		player.getDataWatcher().watch(0, Byte.valueOf((byte) 32), Entity.META_ENTITYDATA, (byte) 32);
+		player.getDataWatcher().watch(0, (byte) 32, Entity.META_ENTITYDATA, (byte) 32);
 
 		// Player > Chicken
 		DisguiseChicken disguise = new DisguiseChicken(Player);
@@ -209,7 +209,7 @@ public class BlockForm extends Form
 	public void SolidifyUpdate()
 	{
 		if (!Player.isSprinting())
-			((CraftEntity) Player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 32), Entity.META_ENTITYDATA,
+			((CraftEntity) Player).getHandle().getDataWatcher().watch(0, (byte) 32, Entity.META_ENTITYDATA,
 					(byte) 32);
 
 		// Not a Block

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java

@@ -44,7 +44,7 @@ public class CreatureForm extends Form
 		_disguise.setSoundDisguise(new DisguiseCat(Player));
 		Host.Manager.GetDisguise().disguise(_disguise);
 
-		((CraftEntity)Player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0), Entity.META_ENTITYDATA, (byte) 0);
+		((CraftEntity)Player).getHandle().getDataWatcher().watch(0, (byte) 0, Entity.META_ENTITYDATA, (byte) 0);
 
 		//Inform
 		UtilPlayer.message(Player, F.main("Game", C.cWhite + "You are now a " + F.elem(UtilEnt.getName(_type)) + "!"));
@@ -62,6 +62,6 @@ public class CreatureForm extends Form
 	{
 		Host.Manager.GetDisguise().undisguise(Player);
 
-		((CraftEntity)Player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0), Entity.META_ENTITYDATA, (byte) 0);
+		((CraftEntity)Player).getHandle().getDataWatcher().watch(0, (byte) 0, Entity.META_ENTITYDATA, (byte) 0);
 	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java

@@ -610,6 +610,12 @@ public class BombLobbers extends TeamGame implements IThrown
 		
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+	
 	public void knockbackIncrease(CustomDamageEvent event)
 	{
 		if (event.GetCause() != DamageCause.ENTITY_EXPLOSION && event.GetCause() != DamageCause.BLOCK_EXPLOSION)

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java

@@ -1634,6 +1634,12 @@ public class BawkBawkBattles extends TeamGame implements IThrown
 		}
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@Override
 	public void Idle(ProjectileUser data)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/anath/SkillMeteor.java

@@ -179,10 +179,15 @@ public class SkillMeteor extends HeroSkill implements IThrown
 		data.getThrown().remove();
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	private void startShower(ProjectileUser data)
 	{
 		Manager.GetBlockRestore().add(data.getThrown().getLocation().getBlock(), Material.NETHERRACK.getId(), (byte) 0, 6000);
 		_data.add(new MeteorShowerData((Player) data.getThrower(), data.getThrown().getLocation(), 6000));
 	}
 }
-

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/bob/SkillBuildPainting.java

@@ -188,6 +188,12 @@ public class SkillBuildPainting extends HeroSkill implements IThrown
 		damage(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	private void damage(ProjectileUser data)
 	{
 		Entity entity = data.getThrown();
@@ -205,5 +211,4 @@ public class SkillBuildPainting extends HeroSkill implements IThrown
 	{
 		return AXIS[Math.round(yaw / 90F) & 0x3];
 	}
-
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/bob/SkillPaint.java

@@ -100,4 +100,10 @@ public class SkillPaint extends HeroSkill implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/hattori/SkillSnowball.java

@@ -91,5 +91,10 @@ public class SkillSnowball extends HeroSkill implements IThrown
 	public void Expire(ProjectileUser data)
 	{
 	}
-}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/larissa/SkillAOEHeal.java

@@ -105,6 +105,12 @@ public class SkillAOEHeal extends HeroSkill implements IThrown
 		deployAoe((Player) data.getThrower(), data.getThrown(), data.getThrown().getLocation());
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void updateAOE(UpdateEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java

@@ -366,4 +366,10 @@ public class Runner extends SoloGame implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperSulphurBomb.java

@@ -65,6 +65,12 @@ public class PerkCreeperSulphurBomb extends SmashPerk
 			Explode(data);
 		}
 		
+		@Override
+		public void ChunkUnload(ProjectileUser data)
+		{
+			data.getThrown().remove();
+		}
+
 		private void Explode(ProjectileUser data)
 		{
 			UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, data.getThrown().getLocation(), 0, 0, 0, 0, 1, ViewDist.MAX, UtilServer.getPlayers());
@@ -100,6 +106,12 @@ public class PerkCreeperSulphurBomb extends SmashPerk
 			Explode(data);
 		}
 		
+		@Override
+		public void ChunkUnload(ProjectileUser data)
+		{
+			data.getThrown().remove();
+		}
+
 		private void Explode(ProjectileUser data)
 		{
 			UtilParticle.PlayParticleToAll(ParticleType.EXPLODE, data.getThrown().getLocation(), 0, 0, 0, 0, 1, ViewDist.LONG);

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/enderman/PerkBlockToss.java

@@ -245,6 +245,12 @@ public class PerkBlockToss extends SmashPerk implements IThrown
 	{
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void BlockForm(EntityChangeBlockEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/golem/PerkIronHook.java

@@ -129,4 +129,9 @@ public class PerkIronHook extends Perk implements IThrown
 		data.getThrown().remove();
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/guardian/PerkWhirlpoolBlade.java

@@ -160,4 +160,10 @@ public class PerkWhirlpoolBlade extends Perk implements IThrown
 	{
 		data.getThrown().remove();
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBounce.java

@@ -160,6 +160,12 @@ public class PerkPigBaconBounce extends SmashPerk implements IThrown
 		Rebound(data.getThrower(), data.getThrown());
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	public void Rebound(LivingEntity player, Entity ent)
 	{
 		ent.getWorld().playSound(ent.getLocation(), Sound.ITEM_PICKUP, 1f, 0.5f);

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/skeletalhorse/PerkBoneRush.java

@@ -250,4 +250,10 @@ public class PerkBoneRush extends SmashPerk implements IThrown
 	{
 		_active.remove(event.getEntity().getUniqueId());
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/slime/PerkSlimeRocket.java

@@ -335,6 +335,12 @@ public class PerkSlimeRocket extends SmashPerk implements IThrown
 
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void SlimeDamage(CustomDamageEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/spider/PerkWebShot.java

@@ -138,6 +138,12 @@ public class PerkWebShot extends SmashPerk implements IThrown
 		Web(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	public void Web(ProjectileUser data)
 	{
 		Location loc = data.getThrown().getLocation();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/squid/PerkFishFlurry.java

@@ -208,6 +208,12 @@ public class PerkFishFlurry extends SmashPerk implements IThrown
 		data.getThrown().remove();
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void Knockback(CustomDamageEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/squid/PerkInkBlast.java

@@ -174,4 +174,10 @@ public class PerkInkBlast extends SmashPerk implements IThrown
 
 		event.AddKnockback(GetName(), _knockbackMagnitude);
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkWitchPotion.java

@@ -191,4 +191,10 @@ public class PerkWitchPotion extends SmashPerk implements IThrown
 	{
 		Collide(null, null, data);
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/zombie/PerkZombieBile.java

@@ -190,6 +190,12 @@ public class PerkZombieBile extends SmashPerk implements IThrown
 		data.getThrown().remove();
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void Knockback(CustomDamageEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/stacker/Stacker.java

@@ -216,4 +216,10 @@ public class Stacker extends SoloGame implements IThrown
 	{
 
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellIcePrison.java

@@ -107,6 +107,12 @@ public class SpellIcePrison extends Spell implements SpellClick, IThrown
 		IcePrison(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void onUpdate(UpdateEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellIceShards.java

@@ -153,4 +153,9 @@ public class SpellIceShards extends Spell implements SpellClick, IThrown
 		handleShard(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellWebShot.java

@@ -157,6 +157,12 @@ public class SpellWebShot extends Spell implements SpellClick, IThrown
 		Web(data, data.getThrown().getLocation());
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	public void Web(ProjectileUser data, Location loc)
 	{
 		data.getThrown().remove();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java

@@ -23,7 +23,6 @@ import mineplex.core.projectile.ProjectileUser;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
-
 import nautilus.game.arcade.kit.Perk;
 
 public class PerkApple extends Perk implements IThrown
@@ -142,6 +141,12 @@ public class PerkApple extends Perk implements IThrown
 		
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void playerDeath(PlayerDeathEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkAxeThrower.java

@@ -20,7 +20,6 @@ import mineplex.core.common.util.UtilInv;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.projectile.IThrown;
 import mineplex.core.projectile.ProjectileUser;
-import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Perk;
 
 public class PerkAxeThrower extends Perk implements IThrown
@@ -107,4 +106,10 @@ public class PerkAxeThrower extends Perk implements IThrown
 	{
 		
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBaconBlast.java

@@ -106,6 +106,12 @@ public class PerkBaconBlast extends Perk implements IThrown
 		Explode(data);
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	public void Explode(ProjectileUser data)
 	{
 		// for whatever reason, you can't put a location in createExplosion if you don't want it to break blocks >.>

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockRestorer.java

@@ -92,4 +92,10 @@ public class PerkBlockRestorer extends Perk implements IThrown
 		
 		UtilFirework.playFirework(entity.getLocation(), Type.BALL_LARGE, Color.WHITE, false, true);
 	}
+	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCowBomb.java

@@ -123,6 +123,12 @@ public class PerkCowBomb extends Perk implements IThrown
 		data.getThrown().remove();
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
+
 	@EventHandler
 	public void Knockback(CustomDamageEvent event)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDirtCannon.java

@@ -218,4 +218,9 @@ public class PerkDirtCannon extends Perk implements IThrown
 
 	}
 	
+	@Override
+	public void ChunkUnload(ProjectileUser data)
+	{
+		data.getThrown().remove();
+	}
 }