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

Properly update patches for upstream merge

Browse Source
This commit is contained in:
Zach Brown
2016-10-21 15:42:49 -05:00
parent 92567cc43a
commit 28d9568ed5
67 changed files with 298 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
View File

@@ -1,14 +1,14 @@
From e24ae8483920061ed713e82d14fe85453584e97d Mon Sep 17 00:00:00 2001
From 6d145e5a2fd5ae436b9fd776e43a8ec7f840f557 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Wed, 30 Mar 2016 01:20:11 -0500
Subject: [PATCH] Add getEntity by UUID API
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d1d268f..35a8602 100644
index 885fc80..7bb6033 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1508,6 +1508,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1506,6 +1506,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.Y = 0L;
}
@@ -16,7 +16,7 @@ index d1d268f..35a8602 100644
@Nullable
public Entity a(UUID uuid) {
WorldServer[] aworldserver = this.worldServer;
@@ -1521,7 +1522,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1519,7 +1520,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
if (worldserver != null) {
Entity entity = worldserver.getEntity(uuid);