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

Updated Upstream (Bukkit/CraftBukkit) (#4779)

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:
f47abd88 SPIGOT-6242: Fix some file line endings
de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable

CraftBukkit Changes:
4475707d SPIGOT-6244: /spawnpoint ignores angle
8b3b096d SPIGOT-6242: Fix some file line endings
4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent​ results in a "Unable to summon entity due to duplicate UUIDs" error
2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change
This commit is contained in:
Jake Potrebic
2020-11-17 19:45:18 -08:00
committed by GitHub
parent a162213b24
commit 899bc53b79
254 changed files with 322 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0351-Duplicate-UUID-Resolve-Option.patch
View File

@@ -197,7 +197,7 @@ index 4bbcd00950405a4bf3ce391b557049a3b1d4aee8..2db0f3e060850ae65033f878ed46b678
ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
CompletableFuture<Either<List<IChunkAccess>, PlayerChunk.Failure>> completablefuture = this.a(chunkcoordintpair, 1, (i) -> {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 180f5690769076ee982f208cb610ce61f49c8487..83ec3c34bc2b063fe3ae7ba48e35b83522d9866b 100644
index 8d220f165435f0c73552dc5e6c912aefbaf91ee1..de2bdd55213613f439cd797bfe01986c8851eaa4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -4,6 +4,8 @@ import com.google.common.annotations.VisibleForTesting;
@@ -209,7 +209,7 @@ index 180f5690769076ee982f208cb610ce61f49c8487..83ec3c34bc2b063fe3ae7ba48e35b835
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
@@ -996,7 +998,22 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -997,7 +999,22 @@ public class WorldServer extends World implements GeneratorAccessSeed {
if (entity1 == null) {
return false;
} else {