Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
526795bacd
* Update patches to handle vineflower decompiler * update patches again to handle inlined simple lambdas * update vf again and re-apply/rebuild patches * update patches after removal of verify-merges flag * fix compile issue * remove maven local * fix some issues * address more issues * fix collision patch * use paperweight release * more fixes * update fineflower and fix patches again * add missing comment descriptor --------- Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
58 Zeilen
2.1 KiB
Diff
58 Zeilen
2.1 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 a3b9b512c4962c5d38598a504e8f0010304abdc0..4461663659f351f844ed78adc8c1ffd0531a7878 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -354,6 +354,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
}
|
|
// Paper end
|
|
}
|
|
+ // Paper start - Bee Stinger API
|
|
+ @Override
|
|
+ public int getBeeStingerCooldown() {
|
|
+ return getHandle().removeStingerTime;
|
|
+ }
|
|
|
|
// Paper start - Add methods for working with arrows stuck in living entities
|
|
@Override
|
|
@@ -368,6 +373,34 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
}
|
|
// Paper end - Add methods for working with arrows stuck in living entities
|
|
|
|
+ @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);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setNextBeeStingerRemoval(final int ticks) {
|
|
+ Preconditions.checkArgument(ticks >= 0, "New amount of ticks before next bee stinger removal must be >= 0");
|
|
+ this.getHandle().removeStingerTime = ticks;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getNextBeeStingerRemoval() {
|
|
+ return this.getHandle().removeStingerTime;
|
|
+ }
|
|
+ // Paper end - Bee Stinger API
|
|
+
|
|
@Override
|
|
public void damage(double amount) {
|
|
this.damage(amount, this.getHandle().damageSources().generic());
|