PaperMC/Spigot-API-Patches/0036-Add-EntityZapEvent.patch

125 lines
4.1 KiB
Diff
Raw Normal View History

From 2527eb4a36c059f3c42f5fc5dbac73c6021c6d10 Mon Sep 17 00:00:00 2001
2016-10-17 08:27:02 +02:00
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:34 -0700
Subject: [PATCH] Add EntityZapEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
new file mode 100644
index 00000000..c8f0bb05
2016-10-17 08:27:02 +02:00
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
@@ -0,0 +1,63 @@
2016-10-17 08:27:02 +02:00
+package com.destroystokyo.paper.event.entity;
+
+import org.apache.commons.lang.Validate;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LightningStrike;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.bukkit.event.entity.EntityTransformEvent;
2016-10-17 08:27:02 +02:00
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
2016-10-17 08:27:02 +02:00
+
+/**
+ * Fired when lightning strikes an entity
+ */
+public class EntityZapEvent extends EntityTransformEvent implements Cancellable {
2016-10-17 08:27:02 +02:00
+ private static final HandlerList handlers = new HandlerList();
+ private boolean cancelled;
+ private final LightningStrike bolt;
+
+ public EntityZapEvent(final Entity entity, @Nonnull final LightningStrike bolt, @Nonnull final Entity replacementEntity) {
+ super(entity, Collections.singletonList(replacementEntity), TransformReason.LIGHTNING);
2016-10-17 08:27:02 +02:00
+ Validate.notNull(bolt);
+ Validate.notNull(replacementEntity);
+ this.bolt = bolt;
+ }
+
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+
+ /**
+ * Gets the lightning bolt that is striking the entity.
+ * @return The lightning bolt responsible for this event
+ */
+ @Nonnull
+ public LightningStrike getBolt() {
+ return bolt;
+ }
+
+ /**
+ * Gets the entity that will replace the struck entity.
+ * @return The entity that will replace the struck entity
+ */
+ @Nonnull
+ public Entity getReplacementEntity() {
+ return getTransformedEntity();
2016-10-17 08:27:02 +02:00
+ }
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+}
diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
index c1d4b30a..de8cad81 100644
2016-10-17 08:27:02 +02:00
--- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
2016-10-17 08:27:02 +02:00
import java.util.Collections;
import org.bukkit.entity.Entity;
2016-10-17 08:27:02 +02:00
+import com.destroystokyo.paper.event.entity.EntityZapEvent;
import org.bukkit.entity.LightningStrike;
import org.bukkit.entity.Pig;
import org.bukkit.entity.PigZombie;
@@ -11,14 +12,14 @@ import org.bukkit.event.HandlerList;
2016-10-17 08:27:02 +02:00
/**
* Stores data for pigs being zapped
*/
-public class PigZapEvent extends EntityTransformEvent implements Cancellable {
2016-10-31 03:42:38 +01:00
- private static final HandlerList handlers = new HandlerList();
2016-10-17 08:27:02 +02:00
+public class PigZapEvent extends EntityZapEvent implements Cancellable {
2016-10-31 03:42:38 +01:00
+ //private static final HandlerList handlers = new HandlerList();
2016-10-17 08:27:02 +02:00
private boolean canceled;
private final PigZombie pigzombie;
private final LightningStrike bolt;
public PigZapEvent(final Pig pig, final LightningStrike bolt, final PigZombie pigzombie) {
- super(pig, Collections.singletonList((Entity) pigzombie), TransformReason.LIGHTNING);
2016-10-17 08:27:02 +02:00
+ super(pig, bolt, pigzombie);
this.bolt = bolt;
this.pigzombie = pigzombie;
}
@@ -57,6 +58,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
2016-10-31 03:42:38 +01:00
return pigzombie;
}
+ // Paper start
+ /*
@Override
public HandlerList getHandlers() {
return handlers;
@@ -65,4 +68,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
2016-10-31 03:42:38 +01:00
public static HandlerList getHandlerList() {
return handlers;
}
+ */
+ // Paper end
}
2016-10-17 08:27:02 +02:00
--
2.19.2
2016-10-17 08:27:02 +02:00