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

Update Upstream

Browse Source 
Removed my ChunkLoadEvent patch as upstream fixed it
This commit is contained in:
Aikar
2018-07-30 01:08:59 -04:00
parent 75d71a2f14
commit 76e1e4d79f
42 changed files with 158 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
View File

@@ -1,4 +1,4 @@
From 4e9e1e8a0136e140460f3054bd60ee7795002846 Mon Sep 17 00:00:00 2001
From fd9f7d8ba57935af3e3126cc41e5910ac3bd9f7f 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 6d4dc539cb..7da6a25f1d 100644
index 2801e34f6b..6af229ce2e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -525,14 +525,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -535,14 +535,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
final CraftEntity other = (CraftEntity) obj;