Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Also minimized all the nms diffs and generic cleanups all around.
This commit is contained in:
Erik Broes
2011-06-27 00:25:01 +02:00
parent 9e5dba8306
commit a98c7ba2c7
126 changed files with 1329 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minecraft/server/EntityPainting.java
View File

@@ -4,10 +4,8 @@ import java.util.ArrayList;
import java.util.List;
// CraftBukkit start
import org.bukkit.Bukkit;
import org.bukkit.event.painting.PaintingBreakByEntityEvent;
import org.bukkit.event.painting.PaintingBreakByWorldEvent;
import org.bukkit.entity.Painting;
// CraftBukkit end
public class EntityPainting extends Entity {
@@ -124,9 +122,8 @@ public class EntityPainting extends Entity {
this.f = 0;
if (!this.h()) {
// CraftBukkit start
Painting painting = (Painting) getBukkitEntity();
PaintingBreakByWorldEvent event = new PaintingBreakByWorldEvent(painting);
Bukkit.getServer().getPluginManager().callEvent(event);
PaintingBreakByWorldEvent event = new PaintingBreakByWorldEvent((org.bukkit.entity.Painting) this.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
@@ -204,9 +201,8 @@ public class EntityPainting extends Entity {
public boolean damageEntity(Entity entity, int i) {
if (!this.dead && !this.world.isStatic) {
// CraftBukkit start
Painting painting = (Painting) getBukkitEntity();
PaintingBreakByEntityEvent event = new PaintingBreakByEntityEvent(painting, entity == null ? null : entity.getBukkitEntity());
Bukkit.getServer().getPluginManager().callEvent(event);
PaintingBreakByEntityEvent event = new PaintingBreakByEntityEvent((org.bukkit.entity.Painting) this.getBukkitEntity(), entity == null ? null : entity.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;