diff options
| author | md_5 <git@md-5.net> | 2018-10-23 06:00:00 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-10-23 06:00:00 +1100 |
| commit | b4230a9a7efde35b30fefdb4a2492209d5334def (patch) | |
| tree | 62e6e1933ed69e46e56a559e2a723d5a91f18244 /nms-patches/SpawnerCreature.patch | |
| parent | a639ae44d24fd7ce48c9390c27dd70cc5fd9d38b (diff) | |
| download | craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar.gz craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar.lz craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar.xz craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.zip | |
Update to Minecraft 1.13.2
Diffstat (limited to 'nms-patches/SpawnerCreature.patch')
| -rw-r--r-- | nms-patches/SpawnerCreature.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/nms-patches/SpawnerCreature.patch b/nms-patches/SpawnerCreature.patch index dca91ed0..2482e10f 100644 --- a/nms-patches/SpawnerCreature.patch +++ b/nms-patches/SpawnerCreature.patch @@ -72,7 +72,7 @@ if (l1 <= k) { @@ -76,8 +107,10 @@ - label128: + label137: while (iterator1.hasNext()) { - ChunkCoordIntPair chunkcoordintpair1 = (ChunkCoordIntPair) iterator1.next(); - BlockPosition blockposition1 = getRandomPosition(worldserver, chunkcoordintpair1.x, chunkcoordintpair1.z); @@ -83,23 +83,23 @@ int i2 = blockposition1.getX(); int j2 = blockposition1.getY(); int k2 = blockposition1.getZ(); -@@ -136,9 +169,12 @@ - if (entityinsentient.a((GeneratorAccess) worldserver, false) && entityinsentient.a((IWorldReader) worldserver)) { - groupdataentity = entityinsentient.prepare(worldserver.getDamageScaler(new BlockPosition(entityinsentient)), groupdataentity, (NBTTagCompound) null); - if (entityinsentient.a((IWorldReader) worldserver)) { -- ++l2; -- ++j4; -- worldserver.addEntity(entityinsentient); -+ // CraftBukkit start -+ if (worldserver.addEntity(entityinsentient, SpawnReason.NATURAL)) { -+ ++l2; -+ ++j4; -+ } -+ // CraftBukkit end - } else { - entityinsentient.die(); - } -@@ -255,7 +291,7 @@ +@@ -140,9 +173,12 @@ + if ((d0 <= 16384.0D || !entityinsentient.isTypeNotPersistent()) && entityinsentient.a((GeneratorAccess) worldserver, false) && entityinsentient.a((IWorldReader) worldserver)) { + groupdataentity = entityinsentient.prepare(worldserver.getDamageScaler(new BlockPosition(entityinsentient)), groupdataentity, (NBTTagCompound) null); + if (entityinsentient.a((IWorldReader) worldserver)) { +- ++l2; +- ++j4; +- worldserver.addEntity(entityinsentient); ++ // CraftBukkit start ++ if (worldserver.addEntity(entityinsentient, SpawnReason.NATURAL)) { ++ ++l2; ++ ++j4; ++ } ++ // CraftBukkit end + } else { + entityinsentient.die(); + } +@@ -260,7 +296,7 @@ entityinsentient.setPositionRotation(d0, (double) blockposition.getY(), d1, random.nextFloat() * 360.0F, 0.0F); if (entityinsentient.a(generatoraccess, false) && entityinsentient.a((IWorldReader) generatoraccess)) { groupdataentity = entityinsentient.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityinsentient)), groupdataentity, (NBTTagCompound) null); |