mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0399d9d6 SPIGOT-5341: Add Material.isAir 547f5709 SPIGOT-5353: Expand explosion API by adding source entity CraftBukkit Changes:7deb3728
SPIGOT-5309: Call cancelled EntityDamageEvent when damaging invisible armor stands46351e17
SPIGOT-5341: Add Material.isAir683bae06
SPIGOT-5342: Lore lost when deserializing items with no version storedc2d12011
SPIGOT-5353: Expand explosion API by adding source entity
30 lines
1010 B
Diff
30 lines
1010 B
Diff
From 045ec7846dc1a311822fa3e963365fc2f41d070e Mon Sep 17 00:00:00 2001
|
|
From: Brokkonaut <hannos17@gmx.de>
|
|
Date: Tue, 3 Jul 2018 16:08:14 +0200
|
|
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 5db2a4cca2..67137d69c1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -1229,6 +1229,15 @@ public class CraftWorld implements World {
|
|
return list;
|
|
}
|
|
|
|
+ // 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);
|
|
+ return entity == null ? null : entity.getBukkitEntity();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void save() {
|
|
org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
|
|
--
|
|
2.23.0
|
|
|