1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf 2020-01-21 18:02:07 -08:00 committed by Zach
parent d4ae43fc00
commit 19de9af63c
624 changed files with 2369 additions and 2370 deletions

View file

@ -1,4 +1,4 @@
From ed6de598138774849832bd9edef9d2a1fc71eab5 Mon Sep 17 00:00:00 2001
From ecb8e3fef8742116a4ee2ae296cb96d7bd7bd7db Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 24 Aug 2018 08:18:27 -0500
Subject: [PATCH] Slime Pathfinder Events
@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java
new file mode 100644
index 000000000..2638bbd3e
index 00000000..2638bbd3
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java
@@ -0,0 +1,38 @@
@ -50,7 +50,7 @@ index 000000000..2638bbd3e
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java
new file mode 100644
index 000000000..14b67da10
index 00000000..14b67da1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java
@@ -0,0 +1,53 @@
@ -109,7 +109,7 @@ index 000000000..14b67da10
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java
new file mode 100644
index 000000000..c8dd49d11
index 00000000..c8dd49d1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java
@@ -0,0 +1,17 @@
@ -132,7 +132,7 @@ index 000000000..c8dd49d11
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java
new file mode 100644
index 000000000..e9ba32799
index 00000000..e9ba3279
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java
@@ -0,0 +1,31 @@
@ -169,7 +169,7 @@ index 000000000..e9ba32799
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java
new file mode 100644
index 000000000..4683a7237
index 00000000..4683a723
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java
@@ -0,0 +1,17 @@
@ -191,7 +191,7 @@ index 000000000..4683a7237
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
index 1119e26e2..c4791f95d 100644
index 1119e26e..c4791f95 100644
--- a/src/main/java/org/bukkit/entity/Slime.java
+++ b/src/main/java/org/bukkit/entity/Slime.java
@@ -14,4 +14,20 @@ public interface Slime extends Mob {
@ -216,5 +216,5 @@ index 1119e26e2..c4791f95d 100644
+ // Paper end
}
--
2.21.0
2.25.0.windows.1