From e7fb6a03116474ce65a1271800166d0d1db9f8ad Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sun, 19 May 2024 16:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=88=B6=E7=88=86=E5=A4=B4=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=88=86=E5=A4=B4=E5=87=BB?= =?UTF-8?q?=E6=9D=80=E7=9A=84=E4=BC=A4=E5=AE=B3=E8=B7=9D=E7=A6=BB=E8=A1=B0?= =?UTF-8?q?=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/screens/KillMessageOverlay.java | 10 +++++----- .../target/event/LivingEntityEventHandler.java | 4 ++-- .../target/textures/screens/headshot.png | Bin 183 -> 4118 bytes 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java b/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java index 4a067bb2b..ee342a14e 100644 --- a/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java +++ b/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java @@ -86,13 +86,13 @@ public class KillMessageOverlay { if (record.headshot) { event.getGuiGraphics().blit(HEADSHOT, w - targetNameWidth - 65 - attackerNameWidth, - h, + h - 2, 0, 0, - 8, - 8, - 8, - 8 + 12, + 12, + 12, + 12 ); } } diff --git a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java index c6801b060..0ebb9513b 100644 --- a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java +++ b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java @@ -64,7 +64,7 @@ public class LivingEntityEventHandler { double damage = amount; ItemStack stack = sourceentity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY; - if (damagesource.is(TargetModDamageTypes.ARROW_IN_BRAIN)) { + if (damagesource.is(TargetModDamageTypes.ARROW_IN_BRAIN) || damagesource.is(TargetModDamageTypes.ARROW_IN_BRAIN_HEADSHOT)) { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); } if ((damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) @@ -73,7 +73,7 @@ public class LivingEntityEventHandler { stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); } - if (damagesource.is(TargetModDamageTypes.GUN_FIRE)) { + if (damagesource.is(TargetModDamageTypes.GUN_FIRE) || damagesource.is(TargetModDamageTypes.GUN_FIRE_HEADSHOT)) { double distance = entity.position().distanceTo(sourceentity.position()); if (stack.is(TargetModTags.Items.SHOTGUN) || stack.getItem() == TargetModItems.BOCEK.get()) { diff --git a/src/main/resources/assets/target/textures/screens/headshot.png b/src/main/resources/assets/target/textures/screens/headshot.png index f4be5a370d6e5989d8d2cc4557863fa3ef7713b4..3e6b02b01688cc9bf5c0aeaa0520d1f0b7498ce1 100644 GIT binary patch literal 4118 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 T>8P?6Xgh