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 655e6e34576247e9c6e0dc75782d760880823d12 Mon Sep 17 00:00:00 2001
From 74ebd795cfb3e9be77acd0fefb44bba990daabd4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 10 Jun 2018 20:20:15 -0400
Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
However, replaced it too to make it clearer of intent.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 495a7c464f..915ccb1807 100644
index 495a7c464..915ccb180 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -723,14 +723,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -45,5 +45,5 @@ index 495a7c464f..915ccb1807 100644
@Override
--
2.24.1
2.25.0.windows.1