mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 8fa15382b [Auto] Updated Upstream (CraftBukkit) 732b2f6b5 [CI-SKIP] [Auto] Rebuild Patches c5a39ffa2 Add BlockPreDispenseEvent (#5075) 8aeb4c9c3 Correctly skip pathfinder ticks for inactive entities (#5085) 0e420049c Fix console spam when removing chests in water 56b7935bb Add PlayerChangeBeaconEffectEvent 2eda45c34 added Wither API 97d0c571b Added Vanilla Entity Tags fccac282a fix NPE in getDisplayNameComponent 24e140372 Configurable max leash distance Tuinity Changes: d3ee22224 Merge dev/lighting
This commit is contained in:
@@ -246,10 +246,10 @@ index 319bb68f27f360bb36897c73a68ddeac64b67a6f..550decf12140596e63b57a7ee5940e4f
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
|
||||
index 71b6fc480617f040029b2201f24d05affeb90b70..48d27d58358e0568579d69320f47e751ea4ec37a 100644
|
||||
index 9d67ce93573f85d64e8f0a8bd9434c130fc75b17..c6a687ffa92bea750b922dfe92bf715a476967e6 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityWither.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityWither.java
|
||||
@@ -317,7 +317,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
|
||||
@@ -322,7 +322,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
|
||||
if (this.getInvul() > 0) {
|
||||
i = this.getInvul() - 1;
|
||||
if (i <= 0) {
|
||||
@@ -258,7 +258,7 @@ index 71b6fc480617f040029b2201f24d05affeb90b70..48d27d58358e0568579d69320f47e751
|
||||
// CraftBukkit start
|
||||
// this.world.createExplosion(this, this.locX(), this.getHeadY(), this.locZ(), 7.0F, false, explosion_effect);
|
||||
ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 7.0F, false);
|
||||
@@ -429,7 +429,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
|
||||
@@ -434,7 +434,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
|
||||
|
||||
if (this.bw > 0) {
|
||||
--this.bw;
|
||||
|
||||
Reference in New Issue
Block a user