Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576)

Browse Source 
* Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
6527cb58 SPIGOT-5329: Clarify isGlowing documentation
5ddb414f Make Lantern extend BlockData
cb888903 Fix typos in previous commits
2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer
3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts
c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice

CraftBukkit Changes:
a3fdef8c SPIGOT-5331: Add support for Java 13
6ddeb980 SPIGOT-5317: Create accessors for player absorption hearts
5d335e96 SPIGOT-5315: Cannot serialize armor stand ItemMeta

Spigot Changes:
94af569b SPIGOT-5319: Async catcher for getNearbyEntities
This commit is contained in:
Spottedleaf
2019-09-21 21:12:45 -07:00
committed by Zach
parent 1e5219940c
commit c68dbb864c
28 changed files with 122 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0231-Fix-CraftEntity-hashCode.patch
View File

@@ -1,4 +1,4 @@
From 7aac589b834910f337649ac862cc5c4bded521e3 Mon Sep 17 00:00:00 2001
From c08536aeb0cb0387c9b623a5b4df96df67131771 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,10 +21,10 @@ 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 b000bc8c71..1cd3448e57 100644
index 09ca9a3eb..517e42218 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -720,14 +720,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -721,14 +721,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
final CraftEntity other = (CraftEntity) obj;
@@ -45,5 +45,5 @@ index b000bc8c71..1cd3448e57 100644
@Override
--
2.22.0
2.22.1