Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
cc0aeb73 Doubles the custom payload size limit imposed by bukkit, also creates a system property to allow customizing the size `paper.maxCustomChannelName`
0f2ea04c Updated Upstream (Bukkit/CraftBukkit/Spigot)
2c8d2040 Re-implement treasure-maps-return-already-discovered for 1.14 (#2636)
8260cdf8 Use getIfLoadedImmediately and not cached immediately for isLoa… (#2641)
ff8b9ef3 Really fix JLine on Windows
c6539607 Revert "Fix jline with git builds under Windows (#2624)" (#2632)
a4dbabdb Update upstream CB
0c64f7b0 Fix jline with git builds under Windows (#2624)
This commit is contained in:
William Blake Galbreath
2019-10-18 22:11:22 -05:00
parent 3d7aac4f20
commit 7089d296ce
4 changed files with 20 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
From c50b654b3f8a79aeb600ea02e31e1d8af4fddf08 Mon Sep 17 00:00:00 2001
From cde13052e3096ede841ba9340d858f455c39f0a7 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 7a0b657f2..c048db0d5 100644
index 6ade18914d..44729ae11a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -483,12 +483,18 @@ public class WorldServer extends World {
@@ -515,12 +515,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 7a0b657f2..c048db0d5 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 882f7711c..f0ed3c974 100644
index 882f7711c7..f0ed3c9749 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 {