From 0bd026f506f8a8a803b4bbdc982a2547e66c8ff8 Mon Sep 17 00:00:00 2001
From: AlexTheCoder <alexjmeech@gmail.com>
Date: Mon, 12 Oct 2015 18:04:35 -0400
Subject: [PATCH] - Fixed merge issues

---
 .../core/packethandler/PacketHandler.java      | 18 ++++--------------
 .../nautilus/game/arcade/ArcadeManager.java    |  6 +-----
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
index 3f1b4b3a7..669213710 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
@@ -4,10 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashSet;
 
-import net.minecraft.server.v1_7_R4.Block;
-import net.minecraft.server.v1_7_R4.BlockSandStone;
 import net.minecraft.server.v1_7_R4.EnumProtocol;
-import net.minecraft.server.v1_7_R4.Item;
 
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
 import org.bukkit.entity.Player;
@@ -25,7 +22,6 @@ public class PacketHandler extends MiniPlugin
 {
 	private NautHashMap<Player, PacketVerifier> _playerVerifierMap = new NautHashMap<Player, PacketVerifier>();
 	private HashSet<IPacketHandler> _packetHandlers = new HashSet<IPacketHandler>();
-	public static Item BANNER = new Item().c("banner");
 
 	public PacketHandler(JavaPlugin plugin)
 	{
@@ -51,11 +47,6 @@ public class PacketHandler extends MiniPlugin
 
 			EnumProtocol.PLAY.a().put(2, PacketPlayUseEntity.class);
 			EnumProtocol.PLAY.a().put(PacketPlayUseEntity.class, 2);
-<<<<<<< HEAD
-
-			Method method = ProtocolInjector.class.getDeclaredMethod("addPacket", EnumProtocol.class, boolean.class, int.class,
-					Class.class);
-=======
 			
 //			NBT Overflow Exploit Handlers
 			EnumProtocol.PLAY.a().put(8, PacketPlayInBlockPace.class);
@@ -69,14 +60,13 @@ public class PacketHandler extends MiniPlugin
 //			----------------------------
 			
 			Method method = ProtocolInjector.class.getDeclaredMethod("addPacket", EnumProtocol.class,boolean.class, int.class, Class.class);
->>>>>>> 1aecc9505c702167aeca5fd3301762264ce46c5d
 			method.setAccessible(true);
 
 			method.invoke(null, EnumProtocol.PLAY, true, 67, PacketPlayOutCamera.class);
 			method.invoke(null, EnumProtocol.PLAY, true, 68, PacketPlayOutWorldBorder.class);
-
-			Item.REGISTRY.a(425, "banner", BANNER);
-			Block.REGISTRY.a(425, "banner", new BlockSandStone());
+			
+		//	EnumProtocol.PLAY.b().put(68, PacketPlayOutWorldBorder.class);
+		//	EnumProtocol.PLAY.b().put(PacketPlayOutWorldBorder.class, 68);
 		}
 		catch (Exception ex)
 		{
@@ -133,4 +123,4 @@ public class PacketHandler extends MiniPlugin
 			verifier.removePacketHandler(packetHandler);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index 5c921e156..c2e8a7ed2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -1565,9 +1565,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 	{
 		_requiredRank = rank;
 	}
-<<<<<<< HEAD
-}
-=======
 	
 	@EventHandler(priority=EventPriority.LOWEST)
 	public void explosionCancel(EntityExplodeEvent event)
@@ -1607,5 +1604,4 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 			event.setCancelled(true);
 		}
 	}
-}
->>>>>>> 1aecc9505c702167aeca5fd3301762264ce46c5d
+}
\ No newline at end of file