mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
Upstream has released updates that appears 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: fd28180e #479: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand ae72ba3a SPIGOT-5591: Allow concurrent potion effects CraftBukkit Changes:3d61a853
Fix formatting in CraftLivingEntityf7ab3055
#633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHandd5ef2eab
SPIGOT-5591: Allow concurrent potion effects25a9a9ff
SPIGOT-5592: Custom ChunkGenerator can cause bugged dirt3f6d0de9
Make it clear in error messages that api-version above 1.13 is also supported
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From f218eddcc79740ff53c5845807eb0119052129e6 Mon Sep 17 00:00:00 2001
|
|
From: mrapple <tony@oc.tc>
|
|
Date: Sun, 25 Nov 2012 13:43:39 -0600
|
|
Subject: [PATCH] Add methods for working with arrows stuck in living entities
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 54c0dae5d1..e38f4f6910 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -623,4 +623,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
public <T> void setMemory(MemoryKey<T> memoryKey, T t) {
|
|
getHandle().getBehaviorController().setMemory(CraftMemoryKey.fromMemoryKey(memoryKey), CraftMemoryMapper.toNms(t));
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public int getArrowsStuck() {
|
|
+ return getHandle().getArrowCount();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setArrowsStuck(int arrows) {
|
|
+ getHandle().setArrowCount(arrows);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.25.0
|
|
|