Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
21faf822 Implement optional per player mobspawning (#2171)
88722ec8 Prevent consuming the wrong itemstack (#2477)
294e3046 Async chunk api/io/loading (#2308)
This commit is contained in:
William Blake Galbreath
2019-08-22 13:16:02 -05:00
parent 5b4de6e7e8
commit 8dbd6295e7
24 changed files with 88 additions and 4470 deletions

View File

@@ -1,4 +1,4 @@
From dc4fde5a01f65b131eb2517455b3c0cd4c88c47c Mon Sep 17 00:00:00 2001
From d8364e2ffae55ab7981db722fffa74d00fd27122 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -9,10 +9,10 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a41d050cf..e73257f3f 100644
index 163d4fa85..f996c2c24 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -402,12 +402,18 @@ public class WorldServer extends World {
@@ -477,12 +477,18 @@ public class WorldServer extends World {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {
@@ -54,5 +54,5 @@ index e515f4775..c7e634ecc 100644
private static void largeEnderChests() {
largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
--
2.20.1
2.23.0.rc1