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

@@ -6,7 +6,7 @@ Subject: [PATCH] Config to make Creepers explode on death
Creepers exploded after being killed in the alpha days. This brings that back.
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index f4b6345777a8f48b0d156bdfa80a5207376caeaf..b6f8d2927152a8e5a1203f3d57efb436cf72b30a 100644
index 99eb17fcc112a4a770903b28fcbe1b9dfce495e2..7287d2bddc28f50987964862ce7eca1dc4d9420a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -63,6 +63,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -32,7 +32,7 @@ index f4b6345777a8f48b0d156bdfa80a5207376caeaf..b6f8d2927152a8e5a1203f3d57efb436
// Purpur end
@Override
@@ -354,6 +363,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -360,6 +369,7 @@ public class Creeper extends Monster implements PowerableMob {
}
public void explodeCreeper() {
@@ -40,7 +40,7 @@ index f4b6345777a8f48b0d156bdfa80a5207376caeaf..b6f8d2927152a8e5a1203f3d57efb436
if (!this.level.isClientSide) {
float f = this.isPowered() ? 2.0F : 1.0F;
@@ -371,7 +381,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -377,7 +387,7 @@ public class Creeper extends Monster implements PowerableMob {
}
// CraftBukkit end
}