Update Upstream
This commit is contained in:
parent
52cd8744e0
commit
f9f71eb14e
321 changed files with 809 additions and 856 deletions
|
@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index c8cbedb5c..f8870f37b 100644
|
||||
index c4818af828..9a92d5b077 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
|
||||
|
@ -13,6 +13,7 @@ index c8cbedb5c..f8870f37b 100644
|
|||
}
|
||||
|
||||
+ // Paper start - getEntity by UUID API
|
||||
+ @Override
|
||||
+ public Entity getEntity(UUID uuid) {
|
||||
+ Validate.notNull(uuid, "UUID cannot be null");
|
||||
+ net.minecraft.server.Entity entity = world.getEntity(uuid);
|
||||
|
@ -20,7 +21,7 @@ index c8cbedb5c..f8870f37b 100644
|
|||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
@Override
|
||||
public void save() {
|
||||
this.server.checkSaveState();
|
||||
try {
|
||||
--
|
Loading…
Add table
Add a link
Reference in a new issue