Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
ef0e5a642d
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: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
33 Zeilen
1.1 KiB
Diff
33 Zeilen
1.1 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
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
index 1d90219c3a0e86786a9497d4c078c2d4077ab6cd..fea44ba6a6584b4a510af6a58cab07eecec6b68b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
|
|
@@ -102,6 +102,21 @@ public class CraftItem extends CraftEntity implements Item {
|
|
public void setWillAge(boolean willAge) {
|
|
item.age = willAge ? 0 : NO_AGE_TIME;
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public int getHealth() {
|
|
+ return item.health;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setHealth(int health) {
|
|
+ if (health <= 0) {
|
|
+ item.getItem().onDestroyed(item);
|
|
+ item.discard();
|
|
+ } else {
|
|
+ item.health = health;
|
|
+ }
|
|
+ }
|
|
// Paper End
|
|
|
|
@Override
|