diff options
author | Wesley Wolfe <weswolf@aol.com> | 2012-07-22 01:18:00 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2012-07-23 23:55:31 -0500 |
commit | b00de5f1768e14238f8660b63eb3fd5d744fc0a9 (patch) | |
tree | 2c1407b1ef81f38e16f3c4e453bec077dfd1eb53 /src/main/java/net/minecraft/server/EntityTrackerEntry.java | |
parent | 8b9aad8c2b4057ab33a7bff2b8711d0d48c13568 (diff) | |
download | craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.gz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.lz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.xz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.zip |
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
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTrackerEntry.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityTrackerEntry.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index 6f1496e8..72e4a325 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -6,6 +6,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +// CraftBukkit start +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerVelocityEvent; +// CraftBukkit end + public class EntityTrackerEntry { public Entity tracker; @@ -168,10 +173,10 @@ public class EntityTrackerEntry { boolean cancelled = false; if (this.tracker instanceof EntityPlayer) { - org.bukkit.entity.Player player = (org.bukkit.entity.Player) this.tracker.getBukkitEntity(); + Player player = (Player) this.tracker.getBukkitEntity(); org.bukkit.util.Vector velocity = player.getVelocity(); - org.bukkit.event.player.PlayerVelocityEvent event = new org.bukkit.event.player.PlayerVelocityEvent(player, velocity); + PlayerVelocityEvent event = new PlayerVelocityEvent(player, velocity); this.tracker.world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -225,7 +230,7 @@ public class EntityTrackerEntry { if (!this.trackedPlayers.contains(entityplayer)) { // CraftBukkit start if (tracker instanceof EntityPlayer) { - org.bukkit.entity.Player player = ((EntityPlayer) tracker).getBukkitEntity(); + Player player = ((EntityPlayer) tracker).getBukkitEntity(); if (!entityplayer.getBukkitEntity().canSee(player)) { return; } |