1 files changed, 32 insertions, 38 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java
index b515f0979e..160b384150 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java
@@ -2,46 +2,40 @@ package gtPlusPlus.plugin.villagers;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.plugin.villagers.entity.EntityBaseVillager;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.world.World;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 
 public class VillagerEventHandler {
 
-	private final static VillagerEventHandler mInstance;
-
-	static {
-		mInstance = new VillagerEventHandler();
-		Utils.registerEvent(mInstance);
-	}	
-
-	@SubscribeEvent
-	public void onEntityJoinWorld(EntityJoinWorldEvent event){
-		
-		
-		/*try {
-			if (event.entity != null && event.entity instanceof EntityLivingBase && event.entity instanceof EntityVillager){
-				EntityVillager entity = (EntityVillager) event.entity;
-				World world = entity.worldObj;	
-				int profession = entity.getProfession();			
-				if (world != null && (profession >= 7735 && profession <= 7737)){				
-					EntityBaseVillager mNew = new EntityBaseVillager(world, profession);				
-					mNew.copyLocationAndAnglesFrom(entity);	
-					if (mNew != null) {
-						world.removeEntity(entity);
-						world.spawnEntityInWorld(mNew);	
-					}
-				}
-
-			}
-		}
-		catch (Throwable t) {
-			t.printStackTrace();
-			return;
-		}*/
-
-	}
-
+    private static final VillagerEventHandler mInstance;
+
+    static {
+        mInstance = new VillagerEventHandler();
+        Utils.registerEvent(mInstance);
+    }
+
+    @SubscribeEvent
+    public void onEntityJoinWorld(EntityJoinWorldEvent event) {
+
+        /*try {
+        	if (event.entity != null && event.entity instanceof EntityLivingBase && event.entity instanceof EntityVillager){
+        		EntityVillager entity = (EntityVillager) event.entity;
+        		World world = entity.worldObj;
+        		int profession = entity.getProfession();
+        		if (world != null && (profession >= 7735 && profession <= 7737)){
+        			EntityBaseVillager mNew = new EntityBaseVillager(world, profession);
+        			mNew.copyLocationAndAnglesFrom(entity);
+        			if (mNew != null) {
+        				world.removeEntity(entity);
+        				world.spawnEntityInWorld(mNew);
+        			}
+        		}
+
+        	}
+        }
+        catch (Throwable t) {
+        	t.printStackTrace();
+        	return;
+        }*/
+
+    }
 }