Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1845cec Fix death message containing empty string (#8656)
PaperMC/Paper@326a65e [ci skip] add missing final newline (#8659)
PaperMC/Paper@0148283 Fix locateNearestBiome nullability check (#8662)
PaperMC/Paper@3822cc8 Update paperweight to 1.4.0
PaperMC/Paper@adb8e49 Fix fire charge not being consumed igniting a creeper (#8652)
This commit is contained in:
BillyGalbreath
2022-12-13 19:50:15 -06:00
parent b7671eeee9
commit cceae2cdb3
7 changed files with 13 additions and 13 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c5eb25b191cbb496be2a761d0b6eec9776319687..8e2e58ae379379808f347d503ddcfbb961c98763 100644
index f8d321e925bf2708e51590542325c1bdc67d5964..fcc6ac180a74daffa173866be3dd97a3ad63ebd7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2233,6 +2233,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2237,6 +2237,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
}