mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 12:11:47 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
39 lines
1.6 KiB
Diff
39 lines
1.6 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 310dcf72f24fcbb86bc5b118536a8ebfc084eb7e..1994dd3c272395a27474ec1b37a924a24fc50fd6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -323,7 +323,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0");
|
|
this.getHandle().getEntityData().set(net.minecraft.world.entity.LivingEntity.DATA_ARROW_COUNT_ID, count);
|
|
}
|
|
+ // 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);
|