Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-06-25 06:14:50 +02:00
Code Issues Projects Releases Wiki Activity

Remove some handlers

Browse Source
This commit is contained in:
Zach Brown 2016-10-30 21:42:38 -05:00
parent 02006e6b24
commit 9fd4ec64e7
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Spigot-API-Patches/0041-Add-EntityZapEvent.patch
View File

@ -1,4 +1,4 @@
From a906e672a86bacf113ff5427fb9f131287652a42 Mon Sep 17 00:00:00 2001
From 4814501c98ba55fe2634f0cabfc8615938866c3b Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
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