mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-27 02:49:10 +00:00
56 lines
3.3 KiB
Diff
56 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sat, 25 Jun 2022 19:54:23 +0800
|
|
Subject: [PATCH] Stick can change ArmorStand arm status
|
|
|
|
|
|
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 b136cdc13d94bc34c998a1986e0c93525356ac5c..a1dd65d71606e1da07be781bf95a326882fa8c9e 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
|
|
@@ -384,6 +384,12 @@ public class ArmorStand extends LivingEntity {
|
|
return InteractionResult.SUCCESS;
|
|
}
|
|
} else {
|
|
+ // Leaves start - stick can change ArmorStand arm status
|
|
+ if (top.leavesmc.leaves.LeavesConfig.stickChangeArmorStandArmStatus && itemstack.is(Items.STICK) && player.isShiftKeyDown()) {
|
|
+ setShowArms(!isShowArms());
|
|
+ }
|
|
+ // Leaves end - stick can change ArmorStand arm status
|
|
+
|
|
if (this.isDisabled(enumitemslot)) {
|
|
return InteractionResult.FAIL;
|
|
}
|
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
|
index 82f97f13671b0acfa43d1f2d8f4d24d10645c039..4d1d7acfacc569ea376c2c519b57e368680b1656 100644
|
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
|
@@ -108,6 +108,7 @@ public final class LeavesConfig {
|
|
redstoneShearsWrench = config.getBoolean("settings.redstone-shears-wrench", redstoneShearsWrench);
|
|
buddingAmethystCanPushByPiston = config.getBoolean("settings.budding-amethyst-can-push-by-piston", buddingAmethystCanPushByPiston);
|
|
spectatorDontGetAdvancement = config.getBoolean("settings.spectator-dont-get-advancement", spectatorDontGetAdvancement);
|
|
+ stickChangeArmorStandArmStatus = config.getBoolean("settings.stick-change-armorstand-arm-status", stickChangeArmorStandArmStatus);
|
|
|
|
config.set("settings.snowball-and-egg-can-knockback-player", null);
|
|
config.set("settings.player-can-edit-sign", null);
|
|
@@ -116,6 +117,7 @@ public final class LeavesConfig {
|
|
config.set("settings.redstone-shears-wrench", null);
|
|
config.set("settings.budding-amethyst-can-push-by-piston", null);
|
|
config.set("settings.spectator-dont-get-advancement", null);
|
|
+ config.set("settings.stick-change-armorstand-arm-status", null);
|
|
}
|
|
}
|
|
|
|
@@ -202,6 +204,11 @@ public final class LeavesConfig {
|
|
private static void spectatorDontGetAdvancement() {
|
|
spectatorDontGetAdvancement = getBoolean("settings.modify.spectator-dont-get-advancement", spectatorDontGetAdvancement);
|
|
}
|
|
+
|
|
+ public static boolean stickChangeArmorStandArmStatus = true;
|
|
+ private static void stickChangeArmorStandHasArm() {
|
|
+ stickChangeArmorStandArmStatus = getBoolean("settings.modify.stick-change-armorstand-arm-status", stickChangeArmorStandArmStatus);
|
|
+ }
|
|
|
|
public static final class WorldConfig {
|
|
|