mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into pre/1.13

Browse source
This commit is contained in:
Shane Freeder 2018-08-17 05:10:45 +01:00
commit 039d6f2f75
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
18 changed files with 225 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
View file

@ -1,4 +1,4 @@
From 4c4ed4d357e2ee60585351f515c1e2ef82754042 Mon Sep 17 00:00:00 2001
From d902c6cdb1dfed8c8eafff0a513e91a87186c94e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 16 May 2018 20:26:16 -0400
Subject: [PATCH] WitchConsumePotionEvent
@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
new file mode 100644
index 00000000..e3035110
index 000000000..790218998
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
@@ -0,0 +1,64 @@
@ -36,7 +36,7 @@ index 00000000..e3035110
+ }
+
+ /**
+ * Gets the potion the witch will consume and have the effects applied.
+ * @return the potion the witch will consume and have the effects applied.
+ */
+ public ItemStack getPotion() {
+ return potion;
@ -77,7 +77,7 @@ index 00000000..e3035110
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
new file mode 100644
index 00000000..6ef6367b
index 000000000..6ef6367b6
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
@@ -0,0 +1,33 @@