aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0209-EnderDragon-Events.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/server/0209-EnderDragon-Events.patch')
-rw-r--r--patches/unapplied/server/0209-EnderDragon-Events.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/patches/unapplied/server/0209-EnderDragon-Events.patch b/patches/unapplied/server/0209-EnderDragon-Events.patch
new file mode 100644
index 0000000000..f78c44aab2
--- /dev/null
+++ b/patches/unapplied/server/0209-EnderDragon-Events.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Sat, 21 Jul 2018 01:51:27 -0500
+Subject: [PATCH] EnderDragon Events
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
+index fe625faf0120b72e892542e4bb5ecea4b73becc7..55b66d3e0d7394a017fb1cdd87e45d7f4eb84976 100644
+--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
++++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
+@@ -89,7 +89,13 @@ public class DragonSittingFlamingPhase extends AbstractDragonSittingPhase {
+ this.flame.setDuration(200);
+ this.flame.setParticle(ParticleTypes.DRAGON_BREATH);
+ this.flame.addEffect(new MobEffectInstance(MobEffects.HARM));
++ if (new com.destroystokyo.paper.event.entity.EnderDragonFlameEvent((org.bukkit.entity.EnderDragon) this.dragon.getBukkitEntity(), (org.bukkit.entity.AreaEffectCloud) this.flame.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
+ world.addFreshEntity(this.flame);
++ // Paper start - EnderDragon Events
++ } else {
++ this.end();
++ }
++ // Paper end - EnderDragon Events
+ }
+
+ }
+diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
+index 68b7bfc139e928192005df8339be371ed8b2a9be..2db75673e525708d04bda9f6c9af80e7f8d361e6 100644
+--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
++++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
+@@ -80,7 +80,9 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
+
+ DragonFireball dragonFireball = new DragonFireball(world, this.dragon, vec34.normalize());
+ dragonFireball.moveTo(o, p, q, 0.0F, 0.0F);
++ if (new com.destroystokyo.paper.event.entity.EnderDragonShootFireballEvent((org.bukkit.entity.EnderDragon) dragon.getBukkitEntity(), (org.bukkit.entity.DragonFireball) dragonFireball.getBukkitEntity()).callEvent()) // Paper - EnderDragon Events
+ world.addFreshEntity(dragonFireball);
++ else dragonFireball.discard(null); // Paper - EnderDragon Events
+ this.fireballCharge = 0;
+ if (this.currentPath != null) {
+ while (!this.currentPath.isDone()) {
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
+index 5b8f3cf80b4fb425bdd0e3b9a431128536c7f1b1..2eecdcbea3d51b1fb6e0c3db0667464a699ca0df 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
+@@ -62,8 +62,10 @@ public class DragonFireball extends AbstractHurtingProjectile {
+ }
+ }
+
++ if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) entityareaeffectcloud.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
+ this.level().levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
+ this.level().addFreshEntity(entityareaeffectcloud);
++ } else entityareaeffectcloud.discard(null); // Paper - EnderDragon Events
+ this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+ }
+