Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
df984898 Fix server deadlock when loading some chunks (#2647)
9ea1f9ee performance improvement for CraftChunk.getEntities() (#2629)
This commit is contained in:
William Blake Galbreath
2019-10-20 04:06:49 -05:00
parent ff887573e2
commit da1de4da09
5 changed files with 15 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
From cde13052e3096ede841ba9340d858f455c39f0a7 Mon Sep 17 00:00:00 2001
From 030524325c17ca3149c46fd4640886dfc0a36865 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 6ade18914d..44729ae11a 100644
index 5b18f4bd52..62e938a78f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -515,12 +515,18 @@ public class WorldServer extends World {
@@ -518,12 +518,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) {