SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Removed EndermanPickup/Place events, replaced with EntityChangeBlock event.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EvilSeph 2012-02-19 04:16:46 -05:00
Ursprung 1922672f14
Commit 4d89a21a25
1 geänderte Dateien mit 2 neuen und 12 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

14
src/main/java/net/minecraft/server/EntityEnderman.java
Datei anzeigen

@ -5,8 +5,6 @@ import java.util.List;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.entity.EndermanPickupEvent;
import org.bukkit.event.entity.EndermanPlaceEvent;
import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.entity.EntityTeleportEvent;
import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityChangeBlockEvent;
// CraftBukkit end // CraftBukkit end
@ -109,14 +107,10 @@ public class EntityEnderman extends EntityMonster {
l = this.world.getTypeId(i, j, k); l = this.world.getTypeId(i, j, k);
if (b[l]) { if (b[l]) {
// CraftBukkit start - pickup event // CraftBukkit start - pickup event
// TODO: We still call the old event
EndermanPickupEvent pickup = new EndermanPickupEvent(this.getBukkitEntity(), this.world.getWorld().getBlockAt(i, j, k));
this.world.getServer().getPluginManager().callEvent(pickup);
EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), this.world.getWorld().getBlockAt(i, j, k), org.bukkit.Material.AIR); EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), this.world.getWorld().getBlockAt(i, j, k), org.bukkit.Material.AIR);
this.world.getServer().getPluginManager().callEvent(event); this.world.getServer().getPluginManager().callEvent(event);
if (!pickup.isCancelled() && !event.isCancelled()) { if (!event.isCancelled()) {
this.setCarriedId(this.world.getTypeId(i, j, k)); this.setCarriedId(this.world.getTypeId(i, j, k));
this.setCarriedData(this.world.getData(i, j, k)); this.setCarriedData(this.world.getData(i, j, k));
this.world.setTypeId(i, j, k, 0); this.world.setTypeId(i, j, k, 0);
@ -133,16 +127,12 @@ public class EntityEnderman extends EntityMonster {
if (l == 0 && i1 > 0 && Block.byId[i1].b()) { if (l == 0 && i1 > 0 && Block.byId[i1].b()) {
// CraftBukkit start - place event // CraftBukkit start - place event
// TODO: We still call the old event
EndermanPlaceEvent place = new EndermanPlaceEvent(this.getBukkitEntity(), new Location(this.world.getWorld(), i, j, k));
this.world.getServer().getPluginManager().callEvent(place);
org.bukkit.block.Block bblock = this.world.getWorld().getBlockAt(i, j, k); org.bukkit.block.Block bblock = this.world.getWorld().getBlockAt(i, j, k);
EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), bblock, bblock.getType()); EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), bblock, bblock.getType());
this.world.getServer().getPluginManager().callEvent(event); this.world.getServer().getPluginManager().callEvent(event);
if (!place.isCancelled() && !event.isCancelled()) { if (!event.isCancelled()) {
this.world.setTypeIdAndData(i, j, k, this.getCarriedId(), this.getCarriedData()); this.world.setTypeIdAndData(i, j, k, this.getCarriedId(), this.getCarriedData());
this.setCarriedId(0); this.setCarriedId(0);
} }