Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Also minimized all the nms diffs and generic cleanups all around.

1 files changed, 4 insertions, 13 deletions

diff --git a/src/main/java/net/minecraft/server/ItemPainting.java b/src/main/java/net/minecraft/server/ItemPainting.java
index 6dd8d483..9ec87d0e 100644
--- a/src/main/java/net/minecraft/server/ItemPainting.java
+++ b/src/main/java/net/minecraft/server/ItemPainting.java
@@ -1,15 +1,8 @@
 package net.minecraft.server;
 
 // CraftBukkit start
-import org.bukkit.Bukkit;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.painting.PaintingPlaceEvent;
-
-import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.block.CraftBlock;
 // CraftBukkit end
 
@@ -44,15 +37,13 @@ public class ItemPainting extends Item {
             if (entitypainting.h()) {
                 if (!world.isStatic) {
                     // CraftBukkit start
-                    CraftWorld craftWorld = ((WorldServer) world).getWorld();
-                    Painting painting = (Painting) entitypainting.getBukkitEntity();
                     Player who = (entityhuman == null) ? null : (Player) entityhuman.getBukkitEntity();
 
-                    Block blockClicked = craftWorld.getBlockAt(i, j, k);
-                    BlockFace blockFace = CraftBlock.notchToBlockFace(l);
+                    org.bukkit.block.Block blockClicked = world.getWorld().getBlockAt(i, j, k);
+                    org.bukkit.block.BlockFace blockFace = CraftBlock.notchToBlockFace(l);
 
-                    PaintingPlaceEvent event = new PaintingPlaceEvent(painting, who, blockClicked, blockFace);
-                    Bukkit.getServer().getPluginManager().callEvent(event);
+                    PaintingPlaceEvent event = new PaintingPlaceEvent((org.bukkit.entity.Painting) entitypainting.getBukkitEntity(), who, blockClicked, blockFace);
+                    world.getServer().getPluginManager().callEvent(event);
 
                     if (event.isCancelled()) {
                         return false;