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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
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:
bbfd13dd Hyperlink 'Events' in raid event package documentation
b2095bed SPIGOT-5413: Add TrustedPlayer API for foxes
1bf1f3f4 Block trace methods do not require hash sets
abf0cfdc Javadoc improvements per checkstyle
c4a2b425 Add TimeSkipEvent

CraftBukkit Changes:
817116de SPIGOT-5413: Add TrustedPlayer API for foxes
062680a8 SPIGOT-5467: Calm down bees that cannot exit hive
75fac431 SPIGOT-5472: Spurious warning when using clone command on tile entities
85106731 SPIGOT-5471: Allow empty title/author for books
2d9db47f Add TimeSkipEvent
384225c2 Add thread name to TerminalConsoleWriterThread

Spigot Changes:
05bb8bcf Postpone stopping the watchdog until the server is completely stopped
18e2b9be Add package-info.java for Spigot APIs
This commit is contained in:
Shane Freeder
2019-12-23 02:37:47 +00:00
parent 3f5564f1bc
commit f8fd607e04
51 changed files with 263 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch
View File

@@ -1,4 +1,4 @@
From 68bda6379bcd93dc02eaba78af9deddd735e1b56 Mon Sep 17 00:00:00 2001
From 74764a9936dcd13520c6bcf1e7e7de723bf6f860 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 14:27:34 -0400
Subject: [PATCH] Duplicate UUID Resolve Option
@@ -210,7 +210,7 @@ index c97349010..ca3f9d3d3 100644
if (list != null) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0138738b3..d59eee27a 100644
index ae1e4b34b..c4fabc477 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -222,7 +222,7 @@ index 0138738b3..d59eee27a 100644
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
@@ -1036,8 +1038,23 @@ public class WorldServer extends World {
@@ -1045,8 +1047,23 @@ public class WorldServer extends World {
if (entity1 == null) {
return false;
} else {
@@ -248,7 +248,7 @@ index 0138738b3..d59eee27a 100644
return true;
}
}
@@ -1176,7 +1193,7 @@ public class WorldServer extends World {
@@ -1185,7 +1202,7 @@ public class WorldServer extends World {
}
Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity);