aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZach Brown <[email protected]>2016-10-30 21:42:38 -0500
committerZach Brown <[email protected]>2016-10-30 21:42:38 -0500
commit9fd4ec64e7b2ec92263edc377ea9b67c8db6e09c (patch)
tree7687f256cd34fb4f7bc19bc2ad48583b2525c602
parent02006e6b24986b97fcfa922eab1fbcae348a01c8 (diff)
downloadPaper-9fd4ec64e7b2ec92263edc377ea9b67c8db6e09c.tar.gz
Paper-9fd4ec64e7b2ec92263edc377ea9b67c8db6e09c.zip
Remove some handlers
-rw-r--r--Spigot-API-Patches/0041-Add-EntityZapEvent.patch23
1 files changed, 20 insertions, 3 deletions
diff --git a/Spigot-API-Patches/0041-Add-EntityZapEvent.patch b/Spigot-API-Patches/0041-Add-EntityZapEvent.patch
index 79b1d0a6a6..937217f1b3 100644
--- a/Spigot-API-Patches/0041-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0041-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From a906e672a86bacf113ff5427fb9f131287652a42 Mon Sep 17 00:00:00 2001
+From 4814501c98ba55fe2634f0cabfc8615938866c3b Mon Sep 17 00:00:00 2001
From: AlphaBlend <[email protected]>
Date: Sun, 16 Oct 2016 23:19:34 -0700
Subject: [PATCH] Add EntityZapEvent
@@ -74,7 +74,7 @@ index 0000000..0da8944
+ }
+}
diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index aa80ebf..0ffb1a0 100644
+index aa80ebf..73844b8 100644
--- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
@@ -1,5 +1,6 @@
@@ -89,8 +89,9 @@ index aa80ebf..0ffb1a0 100644
* Stores data for pigs being zapped
*/
-public class PigZapEvent extends EntityEvent implements Cancellable {
+- private static final HandlerList handlers = new HandlerList();
+public class PigZapEvent extends EntityZapEvent implements Cancellable {
- private static final HandlerList handlers = new HandlerList();
++ //private static final HandlerList handlers = new HandlerList();
private boolean canceled;
private final PigZombie pigzombie;
private final LightningStrike bolt;
@@ -101,6 +102,22 @@ index aa80ebf..0ffb1a0 100644
this.bolt = bolt;
this.pigzombie = pigzombie;
}
+@@ -53,6 +54,8 @@ public class PigZapEvent extends EntityEvent implements Cancellable {
+ return pigzombie;
+ }
+
++ // Paper start
++ /*
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+@@ -61,4 +64,6 @@ public class PigZapEvent extends EntityEvent implements Cancellable {
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
++ */
++ // Paper end
+ }
--
2.10.2