2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/SpawnerCreature.java
|
|
|
|
|
+++ b/net/minecraft/server/SpawnerCreature.java
|
2019-04-23 04:00:00 +02:00
|
|
|
@@ -7,6 +7,10 @@
|
2018-07-15 02:00:00 +02:00
|
|
|
import org.apache.logging.log4j.LogManager;
|
|
|
|
|
import org.apache.logging.log4j.Logger;
|
2016-07-15 12:08:04 +02:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+// CraftBukkit start
|
|
|
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
|
|
|
|
|
+// CraftBukkit end
|
2016-07-15 12:08:04 +02:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
public final class SpawnerCreature {
|
|
|
|
|
|
2019-04-25 04:00:00 +02:00
|
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
2019-04-23 04:00:00 +02:00
|
|
|
@@ -85,9 +89,12 @@
|
|
|
|
|
entityinsentient.setPositionRotation((double) f, (double) k, (double) f1, world.random.nextFloat() * 360.0F, 0.0F);
|
|
|
|
|
if ((entityhuman.e((double) f, (double) k, (double) f1) <= 16384.0D || !entityinsentient.isTypeNotPersistent(entityhuman.e((double) f, (double) k, (double) f1))) && entityinsentient.a((GeneratorAccess) world, EnumMobSpawn.NATURAL) && entityinsentient.a((IWorldReader) world)) {
|
|
|
|
|
groupdataentity = entityinsentient.prepare(world, world.getDamageScaler(new BlockPosition(entityinsentient)), EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
|
|
|
|
|
- ++i;
|
|
|
|
|
- ++i2;
|
|
|
|
|
- world.addEntity(entityinsentient);
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (world.addEntity(entityinsentient, SpawnReason.NATURAL)) {
|
|
|
|
|
+ ++i;
|
|
|
|
|
+ ++i2;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
if (i >= entityinsentient.dC()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
@@ -210,7 +217,7 @@
|
|
|
|
|
|
|
|
|
|
if (entityinsentient.a(generatoraccess, EnumMobSpawn.CHUNK_GENERATION) && entityinsentient.a((IWorldReader) generatoraccess)) {
|
|
|
|
|
groupdataentity = entityinsentient.prepare(generatoraccess, generatoraccess.getDamageScaler(new BlockPosition(entityinsentient)), EnumMobSpawn.CHUNK_GENERATION, groupdataentity, (NBTTagCompound) null);
|
|
|
|
|
- generatoraccess.addEntity(entityinsentient);
|
|
|
|
|
+ generatoraccess.addEntity(entityinsentient, SpawnReason.CHUNK_GEN); // CraftBukkit
|
|
|
|
|
flag = true;
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
}
|
