SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.15

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/nms-patches/SpawnerCreature.patch
View File

@@ -12,19 +12,19 @@
private static final Logger LOGGER = LogManager.getLogger();
@@ -88,9 +92,12 @@
entityinsentient.setPositionRotation((double) f, (double) k, (double) f1, world.random.nextFloat() * 360.0F, 0.0F);
if ((d0 <= 16384.0D || !entityinsentient.isTypeNotPersistent(d0)) && entityinsentient.a((GeneratorAccess) world, EnumMobSpawn.NATURAL) && entityinsentient.a((IWorldReader) world)) {
groupdataentity = entityinsentient.prepare(world, world.getDamageScaler(new BlockPosition(entityinsentient)), EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
entityinsentient.setPositionRotation((double) f, (double) k, (double) f1, worldserver.random.nextFloat() * 360.0F, 0.0F);
if ((d0 <= 16384.0D || !entityinsentient.isTypeNotPersistent(d0)) && entityinsentient.a((GeneratorAccess) worldserver, EnumMobSpawn.NATURAL) && entityinsentient.a((IWorldReader) worldserver)) {
groupdataentity = entityinsentient.prepare(worldserver, worldserver.getDamageScaler(new BlockPosition(entityinsentient)), EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
- ++i;
- ++i2;
- world.addEntity(entityinsentient);
- worldserver.addEntity(entityinsentient);
+ // CraftBukkit start
+ if (world.addEntity(entityinsentient, SpawnReason.NATURAL)) {
+ if (worldserver.addEntity(entityinsentient, SpawnReason.NATURAL)) {
+ ++i;
+ ++i2;
+ }
+ // CraftBukkit end
if (i >= entityinsentient.dC()) {
if (i >= entityinsentient.getMaxSpawnGroup()) {
return;
}
@@ -216,7 +223,7 @@