mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 02:42:14 +01:00
b68b282439
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes:c4a67eed
SPIGOT-4556: Fix plugins closing inventory during drop events5be2ddcb
Replace version constants with methods to prevent compiler inlininga5b9c7b3
Use API method to create offset command completions2bc7d1df
SPIGOT-3747: Add API for force loaded chunksa408f375
SPIGOT-3538: Add getHitBlockFace for ProjectileHitEventb54b9409
SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock79ded7a8
SPIGOT-1811: Death message not shown on respawn screenb4a4f15d
SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory0afed592
SPIGOT-794: Call EntityPlaceEvent for Minecart placement2b2d084a
Add InventoryView#getSlotType01a9959a
Do not use deprecated ItemSpawnEvent constructor9642498d
SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event963f4a5f
Add PlayerItemDamageEvent63db0445
Add API to get / set base arrow damage531c25d7
Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS pluginsd05c8b14
Mappings Updatebd36e200
SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
212 lines
5.9 KiB
Diff
212 lines
5.9 KiB
Diff
From 64eef514b6ae25b70d6492dd9d96b6cdcdd3931f Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 21 Jul 2018 01:51:05 -0500
|
|
Subject: [PATCH] EnderDragon Events
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
|
|
new file mode 100644
|
|
index 00000000..ef2a8dab
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
|
|
@@ -0,0 +1,72 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.AreaEffectCloud;
|
|
+import org.bukkit.entity.DragonFireball;
|
|
+import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+import java.util.Collection;
|
|
+
|
|
+/**
|
|
+ * Fired when a DragonFireball collides with a block/entity and spawns an AreaEffectCloud
|
|
+ */
|
|
+public class EnderDragonFireballHitEvent extends EntityEvent implements Cancellable {
|
|
+ private final Collection<LivingEntity> targets;
|
|
+ private final AreaEffectCloud areaEffectCloud;
|
|
+
|
|
+ public EnderDragonFireballHitEvent(DragonFireball fireball, Collection<LivingEntity> targets, AreaEffectCloud areaEffectCloud) {
|
|
+ super(fireball);
|
|
+ this.targets = targets;
|
|
+ this.areaEffectCloud = areaEffectCloud;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The fireball involved in this event
|
|
+ */
|
|
+ @Override
|
|
+ public DragonFireball getEntity() {
|
|
+ return (DragonFireball) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The living entities hit by fireball
|
|
+ *
|
|
+ * May be null if no entities were hit
|
|
+ *
|
|
+ * @return the targets
|
|
+ */
|
|
+ public Collection<LivingEntity> getTargets() {
|
|
+ return targets;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return The area effect cloud spawned in this collision
|
|
+ */
|
|
+ public AreaEffectCloud getAreaEffectCloud() {
|
|
+ return areaEffectCloud;
|
|
+ }
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ private boolean cancelled = false;
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
|
|
new file mode 100644
|
|
index 00000000..d8c3ab33
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
|
|
@@ -0,0 +1,56 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.AreaEffectCloud;
|
|
+import org.bukkit.entity.EnderDragon;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+/**
|
|
+ * Fired when an EnderDragon spawns an AreaEffectCloud by shooting flames
|
|
+ */
|
|
+public class EnderDragonFlameEvent extends EntityEvent implements Cancellable {
|
|
+ private final AreaEffectCloud areaEffectCloud;
|
|
+
|
|
+ public EnderDragonFlameEvent(EnderDragon enderDragon, AreaEffectCloud areaEffectCloud) {
|
|
+ super(enderDragon);
|
|
+ this.areaEffectCloud = areaEffectCloud;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The enderdragon involved in this event
|
|
+ */
|
|
+ @Override
|
|
+ public EnderDragon getEntity() {
|
|
+ return (EnderDragon) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return The area effect cloud spawned in this collision
|
|
+ */
|
|
+ public AreaEffectCloud getAreaEffectCloud() {
|
|
+ return areaEffectCloud;
|
|
+ }
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ private boolean cancelled = false;
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
|
|
new file mode 100644
|
|
index 00000000..aa70dda1
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
|
|
@@ -0,0 +1,56 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.DragonFireball;
|
|
+import org.bukkit.entity.EnderDragon;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+/**
|
|
+ * Fired when an EnderDragon shoots a fireball
|
|
+ */
|
|
+public class EnderDragonShootFireballEvent extends EntityEvent implements Cancellable {
|
|
+ private final DragonFireball fireball;
|
|
+
|
|
+ public EnderDragonShootFireballEvent(EnderDragon entity, DragonFireball fireball) {
|
|
+ super(entity);
|
|
+ this.fireball = fireball;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The enderdragon shooting the fireball
|
|
+ */
|
|
+ @Override
|
|
+ public EnderDragon getEntity() {
|
|
+ return (EnderDragon) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return The fireball being shot
|
|
+ */
|
|
+ public DragonFireball getFireball() {
|
|
+ return fireball;
|
|
+ }
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ private boolean cancelled = false;
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+}
|
|
--
|
|
2.20.1
|
|
|