Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9205b75c Updated Upstream (CraftBukkit)
c32f8e13 PlayerDeathEvent#shouldDropExperience
05ecc314 Updated Upstream (CraftBukkit)
f8fd607e Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-12-23 22:17:27 -06:00
parent 074110faf7
commit ca55ab06f0
9 changed files with 55 additions and 55 deletions

View File

@@ -1,4 +1,4 @@
From 8274817a5714b4cf69bd350bb538be96e3b18d8f Mon Sep 17 00:00:00 2001
From 261892e5199193eed4f87e8c0c2411a7d0698d1e 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 3739a95c5a..79fa88549a 100644
index 70cbff313..0a9df816c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -531,12 +531,18 @@ public class WorldServer extends World {
@@ -540,12 +540,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 3739a95c5a..79fa88549a 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 882f7711c7..f0ed3c9749 100644
index 511429677..3389d626a 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 {
@@ -54,5 +54,5 @@ index 882f7711c7..f0ed3c9749 100644
private static void largeEnderChests() {
largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
--
2.24.0.rc1
2.24.0