Cleaned up CraftBukkit comments in NMS.

Added newlines at the end of files
Fixed improper line endings on some files
Matched start - end comments
Added some missing comments for diffs
Fixed syntax on some spots
Minimized some diff
Removed some no longer used files
Added comment on some required files with no changes
Fixed imports of items used once
Added imports for items used more than once

1 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c7a67cfa..d8b778ec 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -5,17 +5,19 @@ import java.util.Random;
 
 // CraftBukkit start
 import java.util.UUID;
+
 import org.bukkit.Bukkit;
+import org.bukkit.Server;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Vehicle;
-import org.bukkit.event.entity.EntityCombustByBlockEvent;
 import org.bukkit.event.entity.EntityCombustByEntityEvent;
 import org.bukkit.event.painting.PaintingBreakByEntityEvent;
 import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
@@ -381,7 +383,7 @@ public abstract class Entity {
         if (!this.fireProof) {
             // CraftBukkit start - fallen in lava TODO: this event spams!
             if (this instanceof EntityLiving) {
-                org.bukkit.Server server = this.world.getServer();
+                Server server = this.world.getServer();
 
                 // TODO: shouldn't be sending null for the block.
                 org.bukkit.block.Block damager = null; // ((WorldServer) this.l).getWorld().getBlockAt(i, j, k);
@@ -397,7 +399,7 @@ public abstract class Entity {
 
                 if (this.fireTicks <= 0) {
                     // not on fire yet
-                    EntityCombustEvent combustEvent = new EntityCombustByBlockEvent(damager, damagee, 15);
+                    EntityCombustEvent combustEvent = new org.bukkit.event.entity.EntityCombustByBlockEvent(damager, damagee, 15);
                     server.getPluginManager().callEvent(combustEvent);
 
                     if (!combustEvent.isCancelled()) {
@@ -895,7 +897,7 @@ public abstract class Entity {
         // CraftBukkit start
         if (world == null) {
             this.die();
-            this.world = ((org.bukkit.craftbukkit.CraftWorld) Bukkit.getServer().getWorlds().get(0)).getHandle();
+            this.world = ((CraftWorld) Bukkit.getServer().getWorlds().get(0)).getHandle();
             return;
         }
         // CraftBukkit end
@@ -1124,7 +1126,7 @@ public abstract class Entity {
 
         // CraftBukkit start - reset world
         if (this instanceof EntityPlayer) {
-            org.bukkit.Server server = Bukkit.getServer();
+            Server server = Bukkit.getServer();
             org.bukkit.World bworld = null;
 
             // TODO: Remove World related checks, replaced with WorldUID.
@@ -1141,7 +1143,7 @@ public abstract class Entity {
                 bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(entityPlayer.dimension).getWorld();
             }
 
-            this.spawnIn(bworld == null ? null : ((org.bukkit.craftbukkit.CraftWorld) bworld).getHandle());
+            this.spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle());
         }
         // CraftBukkit end
     }