mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

1.15.2 update (#2887)

Browse source 
Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf 2020-01-21 18:02:07 -08:00 • committed by Zach
commit 19de9af63c
624 changed files with 2369 additions and 2370 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch
View file

@ -1,4 +1,4 @@
From 7d00c8a2e75726da594e0203d6e88cbafb2513b1 Mon Sep 17 00:00:00 2001
From 0080550b42ff659ffcbaea501571e8c4208e4549 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
@ -93,7 +93,7 @@ index c7c600b80..64c327669 100644
int k = MathHelper.floor(entity.locY() / 16.0D);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 464301a1f..85f16bdb8 100644
index 716d30b8d..7c7cd851c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2743,6 +2743,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -105,7 +105,7 @@ index 464301a1f..85f16bdb8 100644
this.uniqueID = uuid;
this.am = this.uniqueID.toString();
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index c97349010..ca3f9d3d3 100644
index 7edca1744..314c77767 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1,6 +1,7 @@
@ -134,7 +134,7 @@ index c97349010..ca3f9d3d3 100644
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;
@@ -598,19 +602,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -602,19 +606,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
for (int j = 0; j < i; ++j) {
List<Entity> entityslice = aentityslice[j]; // Spigot
@ -201,7 +201,7 @@ index c97349010..ca3f9d3d3 100644
if (list == null) {
list = Lists.newArrayList(new Entity[]{entity});
} else {
@@ -618,6 +658,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -622,6 +662,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
}
}
@ -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 ae1e4b34b..c4fabc477 100644
index 3c94aa48c..f973b0799 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 ae1e4b34b..c4fabc477 100644
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
@@ -1045,8 +1047,23 @@ public class WorldServer extends World {
@@ -1055,8 +1057,23 @@ public class WorldServer extends World {
if (entity1 == null) {
return false;
} else {
@ -248,7 +248,7 @@ index ae1e4b34b..c4fabc477 100644
return true;
}
}
@@ -1185,7 +1202,7 @@ public class WorldServer extends World {
@@ -1195,7 +1212,7 @@ public class WorldServer extends World {
}
Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity);