Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add missing annotations

This commit is contained in:
TotalledZebra 2024-02-20 16:38:57 +02:00
parent 0bc5a421e4
commit 1b4a23ce76
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/api/0465-Add-entity-heal-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add entity heal API
diff --git a/src/main/java/org/bukkit/entity/Damageable.java b/src/main/java/org/bukkit/entity/Damageable.java
index c4537080ee1875e984356eee42337a1342f4c9a3..5b23304f0bc6a888294365fd16c7b0e59574bd3d 100644
index c4537080ee1875e984356eee42337a1342f4c9a3..8c5e56b4abde4b2730d54158830218ab6ebbcc9b 100644
--- a/src/main/java/org/bukkit/entity/Damageable.java
+++ b/src/main/java/org/bukkit/entity/Damageable.java
@@ -53,6 +53,30 @@ public interface Damageable extends Entity {
@ -25,7 +25,7 @@ index c4537080ee1875e984356eee42337a1342f4c9a3..5b23304f0bc6a888294365fd16c7b0e5
+ * @param amount The amount to heal this entity by
+ * @param reason The health regain reason
+ */
+ void heal(double amount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason);
+ void heal(double amount, @NotNull org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason);
+
+ /**
+ * Heal this entity by the given amount. This will call {@link org.bukkit.event.entity.EntityRegainHealthEvent}
@ -34,7 +34,7 @@ index c4537080ee1875e984356eee42337a1342f4c9a3..5b23304f0bc6a888294365fd16c7b0e5
+ * @param reason The health regain reason
+ * @param isFastRegen Is the healing considered fast regen or not
+ */
+ void heal(double amount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason, boolean isFastRegen);
+ void heal(double amount, @NotNull org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason, boolean isFastRegen);
+
/**
* Gets the entity's absorption amount.

12
patches/server/1048-Add-entity-heal-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add entity heal API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java
index cc4194ac9d7501b5d15655674dade14d59cb6733..6aaee3ede658160c7dd6ff9064d96b23e3a2196c 100644
index cc4194ac9d7501b5d15655674dade14d59cb6733..a32bf430817b2064803503bb6ef360242288eda8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java
@@ -51,6 +51,23 @@ public class CraftEnderDragonPart extends CraftComplexPart implements EnderDrago
@ -19,12 +19,12 @@ index cc4194ac9d7501b5d15655674dade14d59cb6733..6aaee3ede658160c7dd6ff9064d96b23
+ }
+
+ @Override
+ public void heal(double amount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason) {
+ public void heal(double amount, @org.jetbrains.annotations.NotNull org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason) {
+ this.getParent().heal((float) amount, reason);
+ }
+
+ @Override
+ public void heal(double amount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason, boolean isFastRegen) {
+ public void heal(double amount, @org.jetbrains.annotations.NotNull org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason, boolean isFastRegen) {
+ this.getParent().heal((float) amount, reason, isFastRegen);
+ }
+ // Paper end - entity heal API
@ -33,7 +33,7 @@ index cc4194ac9d7501b5d15655674dade14d59cb6733..6aaee3ede658160c7dd6ff9064d96b23
public double getAbsorptionAmount() {
return this.getParent().getAbsorptionAmount();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index f1e4dfd203d455ec089cd2b5679c4083400dbc7f..d5c4c555aced31199ed39db1d46752cd988a2c64 100644
index f1e4dfd203d455ec089cd2b5679c4083400dbc7f..72dddd67bc16239413bcec9d41e435b3c7681598 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -123,6 +123,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -47,12 +47,12 @@ index f1e4dfd203d455ec089cd2b5679c4083400dbc7f..d5c4c555aced31199ed39db1d46752cd
+ }
+
+ @Override
+ public void heal(double amount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason) {
+ public void heal(double amount, @org.jetbrains.annotations.NotNull org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason) {
+ this.getHandle().heal((float) amount, reason);
+ }
+
+ @Override
+ public void heal(double amount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason, boolean isFastRegen) {
+ public void heal(double amount, @org.jetbrains.annotations.NotNull org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason, boolean isFastRegen) {
+ this.getHandle().heal((float) amount, reason, isFastRegen);
+ }
+ // Paper end - entity heal API