1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
2020-01-21 18:02:07 -08:00 · 2020-01-21 18:02:07 -08:00 · 19de9af63c
commit 19de9af63c
parent d4ae43fc00
624 changed files with 2369 additions and 2370 deletions
--- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
+++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
@ -1,4 +1,4 @@
-From 03e1b338735a7e2ee5581026c54c4b5ffdb4d1f5 Mon Sep 17 00:00:00 2001
+From d4c36e931e1c6a71cd65d79444a85a29e0ab4bae Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:09:40 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
 new file mode 100644
-index 000000000..978813b94
+index 00000000..978813b9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
@@ -0,0 +1,86 @@
@ -97,5 +97,5 @@ index 000000000..978813b94
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1