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

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2018-10-27 00:02:22 -04:00
parent b1ab9ad452
commit c4865a6445
57 changed files with 380 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From cce32d2f2e5368d30242a44a4f7657f7b6d90928 Mon Sep 17 00:00:00 2001
From 317790884a5372d33d4427690f75228d45d1f964 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 4e818198b2..f4af6ea034 100644
index 5689f8390..9aa9882e5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -537,14 +537,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -544,14 +544,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
final CraftEntity other = (CraftEntity) obj;
@@ -45,5 +45,5 @@ index 4e818198b2..f4af6ea034 100644
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
--
2.19.0
2.19.1