mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-10-28 22:40:08 +01:00
ef7a12601f
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: 86b20d4 Updated Upstream (Paper) afd0643 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4 d1db107 Updated Upstream (Paper) EMC Changes: d32f7b26 Updated Paper 0650e984 Only retrack passengers if there are passengers in them Purpur Changes: 5758335 Configurable spawn reinforcements attribute 8849c20 Fix afk broadcast stripped colors fe73b19 Updated Upstream (Paper) f3dccd1 [ci-skip] Specify UTF-8 for Javadoc and JavaCompile 7ad2c5d [ci-skip] More attributes work 19ec1c3 [ci-skip] Uh.. I dont even know.. 1cb7e4e Add PlayerBookTooLargeEvent 4e8a150 Updated Upstream (Paper) 8cabaae Updated Upstream (Paper & Tuinity) AirplaneLite Changes: 20b8c79 Allow gradle wrapper in gitignore 6cd80e9 Updated Upstream (Tuinity)
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tr7zw <tr7zw@live.de>
|
|
Date: Fri, 31 Jul 2020 21:48:14 -0500
|
|
Subject: [PATCH] Item stuck sleep config
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
|
index 747f5085da9dd4c1614d5e9e1ea459b300d025b3..2001e364a2e1d0657cb3395b5a2a56fa5dff6299 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
|
@@ -82,7 +82,7 @@ public class EntityItem extends Entity {
|
|
|
|
if (this.world.isClientSide) {
|
|
this.noclip = false;
|
|
- } else {
|
|
+ } else if (!this.onGround || this.noclip || this.ticksLived % org.yatopiamc.yatopia.server.YatopiaConfig.itemStuckSleepTicks == 0) { // Yatopia
|
|
this.noclip = !this.world.getCubes(this);
|
|
if (this.noclip) {
|
|
this.l(this.locX(), (this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D, this.locZ());
|
|
diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
index 415f7def834399ab94edc380b8201058b424fe45..a790e1e5161d956ccc1023b0d4bcac647627150a 100644
|
|
--- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
+++ b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
@@ -194,4 +194,9 @@ public class YatopiaConfig {
|
|
private static void pistonPushLimit() {
|
|
pistonPushLimit = getInt("settings.pistonPushLimit", 12);
|
|
}
|
|
+
|
|
+ public static int itemStuckSleepTicks = 1;
|
|
+ private static void itemStuckSleepTicks() {
|
|
+ itemStuckSleepTicks = getInt("settings.itemStuckSleepTicks", 1);
|
|
+ }
|
|
}
|