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

Update upstream

Browse Source
This commit is contained in:
Aikar
2018-07-22 13:10:15 -04:00
parent c025f19c31
commit 4b66f1978d
10 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
View File

@@ -1,4 +1,4 @@
From 5f6f08cc867183a3e8e3e5d52a3d31d030100e4c Mon Sep 17 00:00:00 2001
From 92a07e301c03b31ac531b25614d11b10168c3ae8 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
@@ -78,7 +78,7 @@ index 7bd7aa0d9..ba6d5b7ff 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 03afa1236..1f50004cb 100644
index b37fa3829..c56e435b1 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1,5 +1,10 @@
@@ -108,7 +108,7 @@ index 03afa1236..1f50004cb 100644
}
int k = MathHelper.floor(entity.locY / 16.0D);
@@ -868,6 +875,37 @@ public class Chunk implements IChunkAccess {
@@ -865,6 +872,37 @@ public class Chunk implements IChunkAccess {
for (int j = 0; j < i; ++j) {
List entityslice = aentityslice[j]; // Spigot
@@ -147,7 +147,7 @@ index 03afa1236..1f50004cb 100644
this.world.a((Collection) entityslice);
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d725bf13e..7154692ee 100644
index be3b1f096..6eceb1dce 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2735,6 +2735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -159,7 +159,7 @@ index d725bf13e..7154692ee 100644
this.uniqueID = uuid;
this.au = this.uniqueID.toString();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 013f4eef5..b9d03d801 100644
index 747d99dbe..7a9f28421 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -40,7 +40,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {