mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
275173e538
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: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Tue, 22 Jun 2021 23:15:44 -0400
|
|
Subject: [PATCH] Stinger API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index b56504c3e5c457bfe83bbc864dc217c2f0cc9d18..084bf9ab43c322f8856dc8f600a18ae166aaa5ef 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -336,7 +336,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
}
|
|
// Paper end
|
|
}
|
|
+ // Paper Start - Bee Stinger API
|
|
+ @Override
|
|
+ public int getBeeStingerCooldown() {
|
|
+ return getHandle().removeStingerTime;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setBeeStingerCooldown(int ticks) {
|
|
+ getHandle().removeStingerTime = ticks;
|
|
+ }
|
|
|
|
+ @Override
|
|
+ public int getBeeStingersInBody() {
|
|
+ return getHandle().getStingerCount();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setBeeStingersInBody(int count) {
|
|
+ Preconditions.checkArgument(count >= 0, "New bee stinger amount must be >= 0");
|
|
+ getHandle().setStingerCount(count);
|
|
+ }
|
|
+ // Paper End - Bee Stinger API
|
|
@Override
|
|
public void damage(double amount) {
|
|
this.damage(amount, null);
|