Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4a97a7ca Add option to disable pillager patrols (#2626)
23e53aab Backport MC-160177 fix from 1.15 (#2702)
45089d59 Update upstream CB
761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
This commit is contained in:
William Blake Galbreath
2019-11-24 14:01:05 -06:00
parent cfd297a4c3
commit 84e7469798
42 changed files with 106 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patches/server/0064-Add-option-to-set-armorstand-step-height.patch
View File

@@ -1,42 +0,0 @@
From 5632f7443ddeedcff30dccbed2ed6f8576645367 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/PurpurConfig.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 8bd864cb39..f58cfa6da1 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -62,7 +62,7 @@ public class EntityArmorStand extends EntityLiving {
this.leftLegPose = EntityArmorStand.by;
this.rightLegPose = EntityArmorStand.bz;
if (world != null) this.canTick = world.paperConfig.armorStandTick; // Paper - armour stand ticking
- this.K = 0.0F;
+ this.K = net.pl3x.purpur.PurpurConfig.armorstandStepHeight; // Purpur
}
public EntityArmorStand(World world, double d0, double d1, double d2) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 04a58a8da0..f2f61f9975 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -188,6 +188,11 @@ public class PurpurConfig {
requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
}
+ public static float armorstandStepHeight = 0.0F;
+ private static void armorstandSettings() {
+ armorstandStepHeight = (float) getDouble("settings.armorstand.step-height", armorstandStepHeight);
+ }
+
public static int feedMushroomsToCows = 0;
private static void cowsSettings() {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
--
2.24.0.rc1