Even more patches for 1.14

This commit is contained in:
Shane Freeder
2019-04-30 02:20:24 +01:00
parent cab9529fe8
commit 86e7cee50c
35 changed files with 504 additions and 847 deletions

View File

@@ -5,12 +5,12 @@ Subject: [PATCH] EnderDragon Events
diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
index 1906bcfc96..50d291139c 100644
index 4ab310cd6..90f6d58dd 100644
--- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
+++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
@@ -0,0 +0,0 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
this.d.setDuration(200);
this.d.setParticle(Particles.j);
this.d.setParticle(Particles.DRAGON_BREATH);
this.d.a(new MobEffect(MobEffects.HARM));
+ if (new com.destroystokyo.paper.event.entity.EnderDragonFlameEvent((org.bukkit.entity.EnderDragon) this.a.getBukkitEntity(), (org.bukkit.entity.AreaEffectCloud) this.d.getBukkitEntity()).callEvent()) // Paper
this.a.world.addEntity(this.d);
@@ -22,12 +22,13 @@ index 1906bcfc96..50d291139c 100644
++this.c;
}
+
+ public void removeAreaEffect() { this.e(); } // Paper - OBFHELPER
@Override
public void e() {
if (this.d != null) {
this.d.die();
diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
index e742586765..141ba1e5e6 100644
index b46660576..bf15964e7 100644
--- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
+++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
@@ -0,0 +0,0 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -41,7 +42,7 @@ index e742586765..141ba1e5e6 100644
if (this.d != null) {
while (!this.d.b()) {
diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
index 7df8fd4d74..c0d66a0233 100644
index 239be99c5..2195b83ce 100644
--- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
+++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
@@ -0,0 +0,0 @@ public class EntityDragonFireball extends EntityFireball {