Skip to content

Commit

Permalink
Fix MC-266334 (#87)
Browse files Browse the repository at this point in the history
Co-authored-by: Kobe ⑧ <102713261+HaHaWTH@users.noreply.github.com>
  • Loading branch information
PadowYT2 and HaHaWTH authored Jul 22, 2024
1 parent 1caf18d commit c2f66ea
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions patches/server/0095-Fix-MC-266334.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PadowYT2 <me@padow.ru>
Date: Sun, 21 Jul 2024 15:16:54 +0300
Subject: [PATCH] Fix MC-266334
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Kobe ⑧ <102713261+HaHaWTH@users.noreply.github.com>

diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
index 8e71d4d3874ff154eae423a8fb8f15ae08143f4d..e017341d273c7803cc1a78b93a971c41a299ce27 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -516,6 +516,12 @@ public class ArmorStand extends LivingEntity {
boolean flag = source.is(DamageTypeTags.CAN_BREAK_ARMOR_STAND);
boolean flag1 = source.is(DamageTypeTags.ALWAYS_KILLS_ARMOR_STANDS);

+ // Leaf start
+ if (!flag && source.getDirectEntity() instanceof net.minecraft.world.entity.projectile.ShulkerBullet){
+ return false;
+ }
+ // Leaf end
+
if (!flag && !flag1) {
return false;
} else {

0 comments on commit c2f66ea

Please sign in to comment.