From b00de5f1768e14238f8660b63eb3fd5d744fc0a9 Mon Sep 17 00:00:00 2001
From: Wesley Wolfe <weswolf@aol.com>
Date: Sun, 22 Jul 2012 01:18:00 -0500
Subject: 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
---
 src/main/java/net/minecraft/server/EntityHuman.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/main/java/net/minecraft/server/EntityHuman.java')

diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index c552f000..8ce4aeb0 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -4,9 +4,7 @@ import java.util.Iterator;
 import java.util.List;
 
 // CraftBukkit start
-import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.entity.CraftItem;
-import org.bukkit.craftbukkit.TrigMath;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityCombustByEntityEvent;
@@ -319,7 +317,7 @@ public abstract class EntityHuman extends EntityLiving {
 
         float f = MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ);
         // CraftBukkit - Math -> TrigMath
-        float f1 = (float) TrigMath.atan(-this.motY * 0.20000000298023224D) * 15.0F;
+        float f1 = (float) org.bukkit.craftbukkit.TrigMath.atan(-this.motY * 0.20000000298023224D) * 15.0F;
 
         if (f > 0.1F) {
             f = 0.1F;
@@ -577,10 +575,9 @@ public abstract class EntityHuman extends EntityLiving {
                         i = i * 3 / 2;
                     }
                 }
-                /* CraftBukkit start - Don't filter out 0 damage
-                if (i == 0) {
+                if (false && i == 0) { // CraftBukkit - Don't filter out 0 damage
                     return false;
-                } else { CraftBukkit end */
+                } else {
                     Entity entity1 = entity;
 
                     if (entity instanceof EntityArrow && ((EntityArrow) entity).shooter != null) {
@@ -593,7 +590,7 @@ public abstract class EntityHuman extends EntityLiving {
 
                     this.a(StatisticList.x, i);
                     return super.damageEntity(damagesource, i);
-                //} // CraftBukkit
+                }
             }
         }
     }
@@ -800,7 +797,7 @@ public abstract class EntityHuman extends EntityLiving {
                     if (l > 0) {
                         // CraftBukkit start - raise a combust event when somebody hits with a fire enchanted item
                         EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), l * 4);
-                        Bukkit.getPluginManager().callEvent(combustEvent);
+                        org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
 
                         if (!combustEvent.isCancelled()) {
                             entity.setOnFire(combustEvent.getDuration());
-- 
cgit v1.2.3