Merge pull request #91 from bowser0000/developmentv1.8.6

1.8.6

1 files changed, 0 insertions, 31 deletions

diff --git a/src/main/java/me/Danker/handlers/PacketHandler.java b/src/main/java/me/Danker/handlers/PacketHandler.java
index da7900a..a4fd85e 100644
--- a/src/main/java/me/Danker/handlers/PacketHandler.java
+++ b/src/main/java/me/Danker/handlers/PacketHandler.java
@@ -2,19 +2,10 @@ package me.Danker.handlers;
 
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import me.Danker.commands.ToggleCommand;
 import me.Danker.utils.Utils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItemFrame;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
 import net.minecraft.network.Packet;
-import net.minecraft.network.play.client.C02PacketUseEntity;
 import net.minecraft.network.play.server.S04PacketEntityEquipment;
-import net.minecraft.util.BlockPos;
 
 import java.lang.reflect.Field;
 
@@ -36,26 +27,4 @@ public class PacketHandler extends ChannelDuplexHandler {
 		super.channelRead(ctx, msg);
 	}
 	
-	// Ignore item frames with arrows on sea lanterns
-	@Override
-	public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-		if (ToggleCommand.itemFrameOnSeaLanternsToggled && Utils.inDungeons && msg instanceof Packet && msg.getClass().getName().endsWith("C02PacketUseEntity")) {
-			Minecraft mc = Minecraft.getMinecraft();
-			C02PacketUseEntity packet = (C02PacketUseEntity) msg;
-			Entity entityHit = packet.getEntityFromWorld(mc.theWorld);
-			if (entityHit instanceof EntityItemFrame) {
-				EntityItemFrame itemFrame = (EntityItemFrame) entityHit;
-	    		ItemStack item = itemFrame.getDisplayedItem();
-	    		if (item != null && item.getItem() == Items.arrow) {
-		    		BlockPos blockPos = Utils.getBlockUnderItemFrame(itemFrame);
-		    		if (mc.theWorld.getBlockState(blockPos).getBlock() == Blocks.sea_lantern) {
-		    			return;
-		    		}
-	    		}
-			}
-		}
-		
-		super.write(ctx, msg, promise);
-	}
-	
 }