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

@@ -3260,7 +3260,7 @@ index d980b906d9206560741576fa4153c57212f307a0..790d4abbc8e0b288e20e72e63f8190e9
public boolean doHurtTarget(Entity target) {
if (super.doHurtTarget(target)) {
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 805e267090285d625dbeb75b06f8c5ad141a75a4..411baa912b61ce319faef73e187ebf7ac1bacde5 100644
index 338161d2eb15d9264027961b71678b8d2f020fd8..324173e0b97a3f5ed657f876f1723a909eb7f0da 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -59,21 +59,98 @@ public class Creeper extends Monster implements PowerableMob {
@@ -3362,7 +3362,7 @@ index 805e267090285d625dbeb75b06f8c5ad141a75a4..411baa912b61ce319faef73e187ebf7a
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, true));
this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
}
@@ -318,6 +395,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -324,6 +401,7 @@ public class Creeper extends Monster implements PowerableMob {
com.destroystokyo.paper.event.entity.CreeperIgniteEvent event = new com.destroystokyo.paper.event.entity.CreeperIgniteEvent((org.bukkit.entity.Creeper) getBukkitEntity(), ignited);
if (event.callEvent()) {
this.entityData.set(Creeper.DATA_IS_IGNITED, event.isIgnited());