Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
d94d6a29 Optimise IEntityAccess#getPlayerByUUID (#2842)
4237539e Guard against serializing mismatching chunk coordinate (#2844)
c1f57657 Updated Upstream (CraftBukkit)
f5569fd3 Fix SkullMeta.setPlayerProfile() (#2833)
2f527126 Update upstream CB
4151617d Update no chunk loads for hoppers and double chests patch (#2777)
d224bc03 [CI-SKIP] Passage outdated (#2776)
db3af11c Fix race condition with regionfile being closed right after getting one (#2812)
a817508f [CI-SKIP] Update dependency version in README.md (#2817)
9aeba7c9 Prevent bees loading chunks checking hive position (#2828)
This commit is contained in:
William Blake Galbreath
2020-01-12 05:02:57 -06:00
parent f0b888053b
commit 7760fa6dfb
18 changed files with 120 additions and 183 deletions

View File

@@ -1,4 +1,4 @@
From 261892e5199193eed4f87e8c0c2411a7d0698d1e Mon Sep 17 00:00:00 2001
From 3aaa5a6281ff8a911e3f6623bfc8dba4e2990ef1 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 70cbff313..0a9df816c 100644
index 8526a3fda1..a299fbf96a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -540,12 +540,18 @@ public class WorldServer extends World {
@@ -549,12 +549,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) {
@@ -38,7 +38,7 @@ index 70cbff313..0a9df816c 100644
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 511429677..3389d626a 100644
index 5114296777..3389d626af 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -207,6 +207,11 @@ public class PurpurConfig {