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

Update to Minecraft 1.13.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-08-26 12:00:00 +10:00
parent 034c12d001
commit f578d94680
182 changed files with 1891 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
}
}
}
@@ -66,9 +75,31 @@
@@ -66,8 +75,30 @@
for (int k1 = 0; k1 < j; ++k1) {
EnumCreatureType enumcreaturetype = aenumcreaturetype[k1];
@@ -65,12 +65,11 @@
+ // CraftBukkit end
+
if ((!enumcreaturetype.c() || flag1) && (enumcreaturetype.c() || flag) && (!enumcreaturetype.d() || flag2)) {
k = worldserver.a(enumcreaturetype.a());
- int l1 = enumcreaturetype.b() * i / SpawnerCreature.b;
+ int l1 = limit * i / b; // CraftBukkit - use per-world limits
- k = enumcreaturetype.b() * i / SpawnerCreature.b;
+ k = limit * i / SpawnerCreature.b; // CraftBukkit - use per-world limits
int l1 = worldserver.a(enumcreaturetype.a(), k);
if (k <= l1) {
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
if (l1 <= k) {
@@ -76,8 +107,10 @@
label128:
@@ -85,7 +84,7 @@
int j2 = blockposition1.getY();
int k2 = blockposition1.getZ();
@@ -136,9 +169,12 @@
if (entityinsentient.M() && entityinsentient.a((IWorldReader) worldserver)) {
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;
@@ -101,8 +100,8 @@
entityinsentient.die();
}
@@ -255,7 +291,7 @@
entityinsentient.setPositionRotation((double) f, (double) blockposition.getY(), (double) f1, random.nextFloat() * 360.0F, 0.0F);
if (entityinsentient.a(generatoraccess) && entityinsentient.a((IWorldReader) generatoraccess)) {
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);
- generatoraccess.addEntity(entityinsentient);
+ generatoraccess.addEntity(entityinsentient, SpawnReason.CHUNK_GEN); // CraftBukkit