mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +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
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 7876e243d6389bdfc33a5bf7e18eb3b33256919b..59d0002c70e2dae6ab9cb896e0a80e16993e64f3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -338,7 +338,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);
|