mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
8ec7d99ec0
Upstream has released updates that appears to apply and compile correctly Paper Changes: a6ac47e5 Fix numerous item duplication issues and teleport issues b7402f11 Add phantom creative and insomniac controls (#3222) 75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)
54 lines
2.7 KiB
Diff
54 lines
2.7 KiB
Diff
From 97d8a3bb6a940699fdd07db6c75d5ac8d6122f03 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sun, 6 Oct 2019 12:46:35 -0500
|
|
Subject: [PATCH] Add option to set armorstand step height
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityArmorStand.java | 2 +-
|
|
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
index d4aa9b24f..d65544953 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
@@ -62,7 +62,6 @@ public class EntityArmorStand extends EntityLiving {
|
|
this.leftLegPose = EntityArmorStand.bv;
|
|
this.rightLegPose = EntityArmorStand.bw;
|
|
if (world != null) this.canTick = world.paperConfig.armorStandTick; // Paper - armour stand ticking
|
|
- this.H = 0.0F;
|
|
}
|
|
|
|
public EntityArmorStand(World world, double d0, double d1, double d2) {
|
|
@@ -615,6 +614,7 @@ public class EntityArmorStand extends EntityLiving {
|
|
|
|
@Override
|
|
public void tick() {
|
|
+ setStepHeight(world.purpurConfig.armorstandStepHeight); // Purpur
|
|
// Paper start
|
|
if (!this.canTick) {
|
|
if (this.noTickPoseDirty) {
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index 2271d13f1..4bb5ddea4 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -135,6 +135,7 @@ public class PurpurWorldConfig {
|
|
}
|
|
|
|
public boolean boatEjectPlayersOnLand = false;
|
|
+ public float armorstandStepHeight = 0.0F;
|
|
public boolean controllableMinecarts = false;
|
|
public boolean controllableMinecartsPlaceAnywhere = false;
|
|
public float controllableMinecartsStepHeight = 1.0F;
|
|
@@ -147,6 +148,7 @@ public class PurpurWorldConfig {
|
|
public boolean useBetterMending = false;
|
|
private void gameplayMechanicsSettings() {
|
|
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
|
|
+ armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
|
|
controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
|
|
controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
|
|
controllableMinecartsStepHeight = (float) getDouble("gameplay-mechanics.controllable-minecarts.step-height", controllableMinecartsStepHeight);
|
|
--
|
|
2.24.0
|
|
|