summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityPainting.java
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2012-07-22 01:18:00 -0500
committerWesley Wolfe <weswolf@aol.com>2012-07-23 23:55:31 -0500
commitb00de5f1768e14238f8660b63eb3fd5d744fc0a9 (patch)
tree2c1407b1ef81f38e16f3c4e453bec077dfd1eb53 /src/main/java/net/minecraft/server/EntityPainting.java
parent8b9aad8c2b4057ab33a7bff2b8711d0d48c13568 (diff)
downloadcraftbukkit-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/EntityPainting.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityPainting.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java
index 61fbe56a..21eba049 100644
--- a/src/main/java/net/minecraft/server/EntityPainting.java
+++ b/src/main/java/net/minecraft/server/EntityPainting.java
@@ -5,7 +5,6 @@ import java.util.List;
// CraftBukkit start
import org.bukkit.entity.Painting;
-import org.bukkit.event.painting.PaintingBreakByEntityEvent;
import org.bukkit.event.painting.PaintingBreakEvent.RemoveCause;
import org.bukkit.event.painting.PaintingBreakEvent;
// CraftBukkit end
@@ -216,7 +215,7 @@ public class EntityPainting extends Entity {
// CraftBukkit start
PaintingBreakEvent event = null;
if (damagesource.getEntity() != null) {
- event = new PaintingBreakByEntityEvent((Painting) this.getBukkitEntity(), damagesource.getEntity() == null ? null : damagesource.getEntity().getBukkitEntity());
+ event = new org.bukkit.event.painting.PaintingBreakByEntityEvent((Painting) this.getBukkitEntity(), damagesource.getEntity() == null ? null : damagesource.getEntity().getBukkitEntity());
} else {
if (damagesource == DamageSource.FIRE) {
event = new PaintingBreakEvent((Painting) this.getBukkitEntity(), RemoveCause.FIRE);
@@ -284,11 +283,9 @@ public class EntityPainting extends Entity {
}
public void b_(double d0, double d1, double d2) {
- /* CraftBukkit start - not needed for paintings
- if (!this.world.isStatic && !this.dead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
+ if (false && !this.world.isStatic && !this.dead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) { // CraftBukkit start - not needed for paintings
this.die();
this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
}
- // CraftBukkit end */
}
}