103 lines
4.6 KiB
Diff
103 lines
4.6 KiB
Diff
From 851e8e213cfb8cc2fb0e9ceb2c1499cba7ac398e Mon Sep 17 00:00:00 2001
|
|
From: Andy Shulman <andy.shulman@hotmail.com>
|
|
Date: Mon, 15 Apr 2013 20:06:37 -0500
|
|
Subject: [PATCH] Implement SpawnerSpawnEvent.
|
|
|
|
Adds BUKKIT-267
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
index 67c3397..bb6b3d5 100644
|
|
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
@@ -5,7 +5,11 @@ import java.util.Collection;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
|
|
-import org.bukkit.event.entity.CreatureSpawnEvent; // CraftBukkit
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.event.entity.SpawnerSpawnEvent;
|
|
+// CraftBukkit end
|
|
|
|
public abstract class MobSpawnerAbstract {
|
|
|
|
@@ -128,7 +132,12 @@ public abstract class MobSpawnerAbstract {
|
|
|
|
entity.f(nbttagcompound);
|
|
if (entity.world != null) {
|
|
- entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
|
|
+ // CraftBukkit start - call SpawnerSpawnEvent, abort if cancelled
|
|
+ SpawnerSpawnEvent event = CraftEventFactory.callSpawnerSpawnEvent(entity, this.b(), this.c(), this.d());
|
|
+ if (!event.isCancelled()) {
|
|
+ entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
NBTTagCompound nbttagcompound1;
|
|
@@ -152,6 +161,11 @@ public abstract class MobSpawnerAbstract {
|
|
|
|
entity2.f(nbttagcompound2);
|
|
entity2.setPositionRotation(entity1.locX, entity1.locY, entity1.locZ, entity1.yaw, entity1.pitch);
|
|
+ // CraftBukkit start - call SpawnerSpawnEvent, skip if cancelled
|
|
+ SpawnerSpawnEvent event = CraftEventFactory.callSpawnerSpawnEvent(entity2, this.b(), this.c(), this.d());
|
|
+ if (event.isCancelled()) {
|
|
+ continue;
|
|
+ }
|
|
if (entity.world != null) {
|
|
entity.world.addEntity(entity2, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
|
|
}
|
|
@@ -163,7 +177,12 @@ public abstract class MobSpawnerAbstract {
|
|
}
|
|
} else if (entity instanceof EntityLiving && entity.world != null) {
|
|
((EntityInsentient) entity).a((GroupDataEntity) null);
|
|
- this.a().addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
|
|
+ // CraftBukkit start - call SpawnerSpawnEvent, abort if cancelled
|
|
+ SpawnerSpawnEvent event = CraftEventFactory.callSpawnerSpawnEvent(entity, this.b(), this.c(), this.d());
|
|
+ if (!event.isCancelled()) {
|
|
+ this.a().addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
return entity;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index a91ffb1..161506a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type;
|
|
import org.bukkit.block.Block;
|
|
import org.bukkit.block.BlockFace;
|
|
import org.bukkit.block.BlockState;
|
|
+import org.bukkit.block.CreatureSpawner;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.craftbukkit.CraftStatistic;
|
|
import org.bukkit.craftbukkit.CraftWorld;
|
|
@@ -120,6 +121,22 @@ public class CraftEventFactory {
|
|
}
|
|
|
|
/**
|
|
+ * Mob spawner event
|
|
+ */
|
|
+ public static SpawnerSpawnEvent callSpawnerSpawnEvent(Entity spawnee, int spawnerX, int spawnerY, int spawnerZ) {
|
|
+ org.bukkit.craftbukkit.entity.CraftEntity entity = spawnee.getBukkitEntity();
|
|
+ BlockState state = entity.getWorld().getBlockAt(spawnerX, spawnerY, spawnerZ).getState();
|
|
+
|
|
+ if (!(state instanceof CreatureSpawner)) {
|
|
+ state = null;
|
|
+ }
|
|
+
|
|
+ SpawnerSpawnEvent event = new SpawnerSpawnEvent(entity, (CreatureSpawner) state);
|
|
+ entity.getServer().getPluginManager().callEvent(event);
|
|
+ return event;
|
|
+ }
|
|
+
|
|
+ /**
|
|
* Bucket methods
|
|
*/
|
|
public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) {
|
|
--
|
|
1.8.3.2
|
|
|