mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 4bcebab1 Add getOfflinePlayerIfCached(String) 67c30690 Fix ghost blocks in ticking view distance 8e6d90c2 [CI-SKIP] Add a GitHub Actions job (#4703) 0ac53efb Avoid crashing clients when fishing loot is empty, Fixes #4235 (#4681) b64ee74a Fix armor stands still doing entity collision Tuinity Changes: 576e2cc Rate limit incoming packets
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to set armorstand step height
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
index 81df71b7e..afa23395c 100644
|
||||
index aff8394524..a637ff4e99 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
@@ -617,6 +617,7 @@ public class EntityArmorStand extends EntityLiving {
|
||||
@@ -618,6 +618,7 @@ public class EntityArmorStand extends EntityLiving {
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
@@ -17,7 +17,7 @@ index 81df71b7e..afa23395c 100644
|
||||
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 95e801ce2..f01c74a2e 100644
|
||||
index 95e801ce26..f01c74a2ea 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -63,6 +63,11 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user