mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From ef8b18f87f25e253331cd7eb61425a2e8c3f6fdd Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 6 Oct 2018 20:54:23 -0500
|
|
Subject: [PATCH] Implement getters and setters for EntityItem owner and
|
|
thrower
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
index 3f552b5905..cb756b1ba0 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
@@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType;
|
|
import org.bukkit.entity.Item;
|
|
import org.bukkit.inventory.ItemStack;
|
|
|
|
+// Paper start
|
|
+import javax.annotation.Nullable;
|
|
+import java.util.UUID;
|
|
+// Paper end
|
|
+
|
|
public class CraftItem extends CraftEntity implements Item {
|
|
private final EntityItem item;
|
|
|
|
@@ -56,6 +61,28 @@ public class CraftItem extends CraftEntity implements Item {
|
|
public void setCanMobPickup(boolean canMobPickup) {
|
|
item.canMobPickup = canMobPickup;
|
|
}
|
|
+
|
|
+ @Nullable
|
|
+ @Override
|
|
+ public UUID getOwner() {
|
|
+ return item.getOwner();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setOwner(@Nullable UUID owner) {
|
|
+ item.setOwner(owner);
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ @Override
|
|
+ public UUID getThrower() {
|
|
+ return item.getThrower();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setThrower(@Nullable UUID thrower) {
|
|
+ item.setThrower(thrower);
|
|
+ }
|
|
// Paper End
|
|
|
|
@Override
|
|
--
|
|
2.21.0
|
|
|