summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/World.java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-04-14 06:56:23 -0500
committerfeildmaster <admin@feildmaster.com>2012-04-15 01:52:51 -0500
commit27a9b4c907a21cffa5c41c07f25c20a6b961b6f9 (patch)
tree6e9c00bcfcda62a0ca8631ba4b7f268b44721321 /src/main/java/net/minecraft/server/World.java
parent0026a08fa8b5979349d90a2e61821e64dbd088e3 (diff)
downloadcraftbukkit-27a9b4c907a21cffa5c41c07f25c20a6b961b6f9.tar
craftbukkit-27a9b4c907a21cffa5c41c07f25c20a6b961b6f9.tar.gz
craftbukkit-27a9b4c907a21cffa5c41c07f25c20a6b961b6f9.tar.lz
craftbukkit-27a9b4c907a21cffa5c41c07f25c20a6b961b6f9.tar.xz
craftbukkit-27a9b4c907a21cffa5c41c07f25c20a6b961b6f9.zip
Filter entity spawning sanely.
Diffstat (limited to 'src/main/java/net/minecraft/server/World.java')
-rw-r--r--src/main/java/net/minecraft/server/World.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 86478ada..b5879e82 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -882,7 +882,7 @@ public class World implements IBlockAccess {
boolean isAnimal = entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal || entity instanceof EntityGolem;
boolean isMonster = entity instanceof EntityMonster || entity instanceof EntityGhast || entity instanceof EntitySlime;
- if (spawnReason == SpawnReason.NATURAL || spawnReason == SpawnReason.CHUNK_GEN || spawnReason == SpawnReason.JOCKEY || spawnReason == SpawnReason.SPAWNER || spawnReason == SpawnReason.BED || spawnReason == SpawnReason.EGG || spawnReason == SpawnReason.VILLAGE_INVASION || spawnReason == SpawnReason.VILLAGE_DEFENSE || spawnReason == SpawnReason.BUILD_SNOWMAN || spawnReason == SpawnReason.BUILD_IRONGOLEM) {
+ if (spawnReason != SpawnReason.CUSTOM) {
if (isAnimal && !allowAnimals || isMonster && !allowMonsters) {
entity.dead = true;
return false;