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

@@ -52,10 +52,10 @@ index c77f76d3b346d25aa48233ad8516a85118f26a9f..79ee10b16295d2eafe1555331c03d455
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8e2e58ae379379808f347d503ddcfbb961c98763..069bb67d1f79e63dce85cba347a1fd67a4781043 100644
index fcc6ac180a74daffa173866be3dd97a3ad63ebd7..804f81c478c09a5b6d0b10a78dc2b7ae0b88cc18 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2237,6 +2237,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2241,6 +2241,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public float getLocalDifficultyAt(Location location) {
return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
}