Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
eb38e51ee0
it used public method instead of private, and moved to world config also improved the implementation to not use obfuscated stuff Also removed the Fix Double chest conversion patch since its fixed in other ways in vanilla
83 Zeilen
2.5 KiB
Diff
83 Zeilen
2.5 KiB
Diff
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 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/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
|
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
|
@@ -410,20 +410,22 @@ public class EntityItem extends Entity {
|
|
this.getDataWatcher().set(EntityItem.b, itemstack);
|
|
}
|
|
|
|
- @Nullable
|
|
- public UUID k() {
|
|
+ @Nullable public UUID getOwner() { return k(); } // Paper - OBFHELPER
|
|
+ @Nullable public UUID k() { // Paper
|
|
return this.g;
|
|
}
|
|
|
|
+ public void setOwner(@Nullable UUID owner) { b(owner); } // Paper - OBFHELPER
|
|
public void b(@Nullable UUID uuid) {
|
|
this.g = uuid;
|
|
}
|
|
|
|
- @Nullable
|
|
- public UUID l() {
|
|
+ @Nullable public UUID getThrower() { return l(); } // Paper - OBFHELPER
|
|
+ @Nullable public UUID l() { // Paper
|
|
return this.f;
|
|
}
|
|
|
|
+ public void setThrower(@Nullable UUID thrower) { c(thrower); } // Paper - OBFHELPER
|
|
public void c(@Nullable UUID uuid) {
|
|
this.f = uuid;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
@@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
|
|
import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
|
|
+// Paper start
|
|
+import javax.annotation.Nullable;
|
|
+import java.util.UUID;
|
|
+// Paper end
|
|
+
|
|
public class CraftItem extends CraftEntity implements Item {
|
|
private final EntityItem item;
|
|
|
|
@@ -45,6 +50,24 @@ public class CraftItem extends CraftEntity implements Item {
|
|
public void setCanMobPickup(boolean canMobPickup) {
|
|
item.canMobPickup = canMobPickup;
|
|
}
|
|
+
|
|
+ @Nullable
|
|
+ public UUID getOwner() {
|
|
+ return item.getOwner();
|
|
+ }
|
|
+
|
|
+ public void setOwner(@Nullable UUID owner) {
|
|
+ item.setOwner(owner);
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ public UUID getThrower() {
|
|
+ return item.getThrower();
|
|
+ }
|
|
+
|
|
+ public void setThrower(@Nullable UUID thrower) {
|
|
+ item.setThrower(thrower);
|
|
+ }
|
|
// Paper End
|
|
|
|
@Override
|
|
--
|
|
2.19.1
|
|
|