CraftBukkit comment fixes

src/main/java/net/minecraft/server/BlockTripwire.java

@@ -3,10 +3,7 @@ package net.minecraft.server;
 import java.util.List;
 import java.util.Random;
 
-// CraftBukkit start
+import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit
-import org.bukkit.event.block.BlockRedstoneEvent;
-import org.bukkit.event.entity.EntityInteractEvent;
-// CraftBukkit end
 
 public class BlockTripwire extends Block {
 

src/main/java/net/minecraft/server/EntityEgg.java

@@ -4,7 +4,6 @@ package net.minecraft.server;
 import org.bukkit.entity.Ageable;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.player.PlayerEggThrowEvent;
 // CraftBukkit end
 
@@ -49,7 +48,7 @@ public class EntityEgg extends EntityProjectile {
 
         if (hatching) {
             for (int k = 0; k < numHatching; k++) {
-                org.bukkit.entity.Entity entity = world.getWorld().spawn(new org.bukkit.Location(world.getWorld(), this.locX, this.locY, this.locZ, this.yaw, 0.0F), hatchingType.getEntityClass(), SpawnReason.EGG);
+                org.bukkit.entity.Entity entity = world.getWorld().spawn(new org.bukkit.Location(world.getWorld(), this.locX, this.locY, this.locZ, this.yaw, 0.0F), hatchingType.getEntityClass(), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG);
                 if (entity instanceof Ageable) {
                     ((Ageable) entity).setBaby();
                 }

src/main/java/net/minecraft/server/EntityEnderPearl.java

@@ -2,7 +2,6 @@ package net.minecraft.server;
 
 // CraftBukkit start
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 // CraftBukkit end
@@ -32,7 +31,7 @@ public class EntityEnderPearl extends EntityProjectile {
 
                 if (!entityplayer.netServerHandler.disconnected && entityplayer.world == this.world) {
                     // CraftBukkit start
-                    CraftPlayer player = entityplayer.getBukkitEntity();
+                    org.bukkit.craftbukkit.entity.CraftPlayer player = entityplayer.getBukkitEntity();
                     org.bukkit.Location location = getBukkitEntity().getLocation();
                     location.setPitch(player.getLocation().getPitch());
                     location.setYaw(player.getLocation().getYaw());

src/main/java/net/minecraft/server/EntityPig.java

@@ -1,5 +1,7 @@
 package net.minecraft.server;
 
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
 public class EntityPig extends EntityAnimal {
 
     public EntityPig(World world) {
@@ -82,7 +84,7 @@ public class EntityPig extends EntityAnimal {
             }
         }
 
-        org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, loot);
+        CraftEventFactory.callEntityDeathEvent(this, loot);
         // CraftBukkit end
     }
 
@@ -103,7 +105,7 @@ public class EntityPig extends EntityAnimal {
             EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
 
             // CraftBukkit start
-            if (org.bukkit.craftbukkit.event.CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
+            if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                 return;
             }
             // CraftBukkit end

src/main/java/net/minecraft/server/MinecraftServer.java

@@ -170,7 +170,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
                     world = new DemoWorldServer(this, new ServerNBTManager(server.getWorldContainer(), s1, true), s1, dimension, this.methodProfiler);
                 } else {
                     // CraftBukkit
-                    world = new WorldServer(this, new ServerNBTManager(server.getWorldContainer(), s1, true), s1, dimension, worldsettings, this.methodProfiler, org.bukkit.World.Environment.getEnvironment(dimension), gen);
+                    world = new WorldServer(this, new ServerNBTManager(server.getWorldContainer(), s1, true), s1, dimension, worldsettings, this.methodProfiler, Environment.getEnvironment(dimension), gen);
                 }
             } else {
                 String dim = "DIM" + dimension;
@@ -204,7 +204,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
                 this.c(name);
 
                 // CraftBukkit
-                world = new SecondaryWorldServer(this, new ServerNBTManager(server.getWorldContainer(), name, true), name, dimension, worldsettings, this.worlds.get(0), this.methodProfiler, org.bukkit.World.Environment.getEnvironment(dimension), gen);
+                world = new SecondaryWorldServer(this, new ServerNBTManager(server.getWorldContainer(), name, true), name, dimension, worldsettings, this.worlds.get(0), this.methodProfiler, Environment.getEnvironment(dimension), gen);
             }
 
             if (gen != null) {

src/main/java/net/minecraft/server/NetServerHandler.java

@@ -847,7 +847,7 @@ public class NetServerHandler extends NetHandler {
                             ((EntityPlayer) recipient).sendMessage(s);
                         }
                     } else {
-                        for (org.bukkit.entity.Player recipient : event.getRecipients()) {
+                        for (Player recipient : event.getRecipients()) {
                             recipient.sendMessage(s);
                         }
                     }

src/main/java/net/minecraft/server/Packet.java

@@ -26,7 +26,8 @@ public abstract class Packet {
 
     public Packet() {
         packetID = ((Integer) a.get(this.getClass())).intValue();
-    } // CraftBukkit end
+    }
+    // CraftBukkit end
 
     static void a(int i, boolean flag, boolean flag1, Class oclass) {
         if (l.b(i)) {

src/main/java/net/minecraft/server/TileEntityMobSpawner.java

@@ -2,8 +2,6 @@ package net.minecraft.server;
 
 import java.util.Iterator;
 
-import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; // CraftBukkit
-
 public class TileEntityMobSpawner extends TileEntity {
 
     public int spawnDelay = -1;
@@ -71,7 +69,7 @@ public class TileEntityMobSpawner extends TileEntity {
                         entity.setPositionRotation(d3, d4, d5, this.world.random.nextFloat() * 360.0F, 0.0F);
                         if (entityliving == null || entityliving.canSpawn()) {
                             this.a(entity);
-                            this.world.addEntity(entity, SpawnReason.SPAWNER); // CraftBukkit
+                            this.world.addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
                             this.world.triggerEffect(2004, this.x, this.y, this.z, 0);
                             if (entityliving != null) {
                                 entityliving.aK();