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

Upstream tacos

Browse Source
This commit is contained in:
Aikar
2016-06-30 01:23:30 -04:00
parent 5b1c69a2f2
commit 22f2c98375
14 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0112-Add-getEntity-by-UUID-API.patch
View File

@@ -1,14 +1,14 @@
From 40c2809484e385f980422a51dceb91e97b840b4c Mon Sep 17 00:00:00 2001
From 7c894ae97ba5f7e12014d7a4d9aeec71bc503a14 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 4b60fed..64868c0 100644
index a441b80..d0aeec2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1513,6 +1513,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1514,6 +1514,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
this.Y = 0L;
}
@@ -16,7 +16,7 @@ index 4b60fed..64868c0 100644
@Nullable
public Entity a(UUID uuid) {
WorldServer[] aworldserver = this.worldServer;
@@ -1526,7 +1527,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -1527,7 +1528,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
if (worldserver != null) {
Entity entity = worldserver.getEntity(uuid);
@@ -26,7 +26,7 @@ index 4b60fed..64868c0 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index de45d8b..5cb0eba 100644
index 8f08fa5..91d00dc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -46,6 +46,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;