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/0163-Add-more-Witch-API.patch
+++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch
@ -1,11 +1,11 @@
-From cf294a7cb160aee89d26509009c13b9415132a73 Mon Sep 17 00:00:00 2001
+From d4957c651a67e0bea676153a8d426681e9d43990 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 03:47:26 -0500
 Subject: [PATCH] Add more Witch API


 diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index aa88aede6..cd8d0a20e 100644
+index aa88aede..cd8d0a20 100644
 --- a/src/main/java/org/bukkit/entity/Witch.java
 +++ b/src/main/java/org/bukkit/entity/Witch.java
@@ -2,8 +2,43 @@ package org.bukkit.entity;
@ -53,5 +53,5 @@ index aa88aede6..cd8d0a20e 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1