Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
90fe0d58a5
Upstream has released updates that appear 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: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
35 Zeilen
1.2 KiB
Diff
35 Zeilen
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 28 Aug 2021 09:00:45 -0700
|
|
Subject: [PATCH] Add API for item entity health
|
|
|
|
== AT ==
|
|
public net.minecraft.world.entity.item.ItemEntity health
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
index 43f6422fedae4304801c7be21990725eca11fc62..0a075ad3bbe13abc20c1f344cb706278b27bb202 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
@@ -98,6 +98,21 @@ public class CraftItem extends CraftEntity implements Item {
|
|
public void setWillAge(boolean willAge) {
|
|
this.getHandle().age = willAge ? 0 : NO_AGE_TIME;
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public int getHealth() {
|
|
+ return this.getHandle().health;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setHealth(int health) {
|
|
+ if (health <= 0) {
|
|
+ this.getHandle().getItem().onDestroyed(this.getHandle());
|
|
+ this.getHandle().discard();
|
|
+ } else {
|
|
+ this.getHandle().health = health;
|
|
+ }
|
|
+ }
|
|
// Paper End
|
|
|
|
@Override
|