Change some default config options to match vanilla behaviors

This commit is contained in:
William Blake Galbreath
2019-07-28 06:35:15 -05:00
parent 6b2be588df
commit b9c7dca7b8
17 changed files with 180 additions and 151 deletions

View File

@@ -1,4 +1,4 @@
From 13cceab96a020767c5cbc232a147d50faa77610e Mon Sep 17 00:00:00 2001
From 487794d0b2e451e53ef0ddf1121a5a620c260032 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Tue, 11 Jun 2019 22:22:16 -0400
Subject: [PATCH] implement optional per player mob spawns
@@ -92,7 +92,7 @@ index 4c774e31dc..ebf0298631 100644
int i = b(chunkcoordintpair, entityplayer, true);
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 925efd4a15..70580355c6 100644
index 5c0d9c77c4..1418264f8a 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -20,16 +20,15 @@ public final class SpawnerCreature {
@@ -115,7 +115,7 @@ index 925efd4a15..70580355c6 100644
if (k >= 1) {
IBlockData iblockdata = world.getTypeIfLoadedAndInBounds(blockposition1); // Paper - don't load chunks for mob spawn
@@ -104,7 +103,7 @@ public final class SpawnerCreature {
@@ -107,7 +106,7 @@ public final class SpawnerCreature {
);
if (!event.callEvent()) {
if (event.shouldAbortSpawn()) {
@@ -124,7 +124,7 @@ index 925efd4a15..70580355c6 100644
}
++i2;
continue;
@@ -123,7 +122,7 @@ public final class SpawnerCreature {
@@ -126,7 +125,7 @@ public final class SpawnerCreature {
} catch (Exception exception) {
SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
ServerInternalException.reportInternalException(exception); // Paper
@@ -133,7 +133,7 @@ index 925efd4a15..70580355c6 100644
}
entityinsentient.setPositionRotation((double) f, (double) k, (double) f1, world.random.nextFloat() * 360.0F, 0.0F);
@@ -134,15 +133,15 @@ public final class SpawnerCreature {
@@ -137,15 +136,15 @@ public final class SpawnerCreature {
++i;
++i2;
// Paper start - stop when limit is reached
@@ -153,7 +153,7 @@ index 925efd4a15..70580355c6 100644
}
if (entityinsentient.c(i2)) {
@@ -168,7 +167,7 @@ public final class SpawnerCreature {
@@ -171,7 +170,7 @@ public final class SpawnerCreature {
}
}