2020-07-17 18:05:50 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-06-27 17:50:15 +02:00
|
|
|
From: tr7zw <tr7zw@live.de>
|
2020-08-03 18:48:42 +02:00
|
|
|
Date: Fri, 31 Jul 2020 21:28:00 -0500
|
2020-06-27 17:50:15 +02:00
|
|
|
Subject: [PATCH] Allow to change the piston push limit
|
|
|
|
|
|
|
|
|
2020-08-03 18:48:42 +02:00
|
|
|
diff --git a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
|
|
|
index 2cee6e02a7dcbacb5f002f9c5917a2e26bcf2c82..3c654db72bf0a8b56dafd73df8a59f76d27360ae 100644
|
|
|
|
--- a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
|
|
|
+++ b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
|
|
|
@@ -209,5 +209,10 @@ public class YatopiaConfig {
|
|
|
|
public static boolean onlyPlayerCollisions = false;
|
|
|
|
private static void onlyPlayerCollisions() {
|
|
|
|
onlyPlayerCollisions = getBoolean("settings.onlyPlayerCollisions", false);
|
|
|
|
- }
|
|
|
|
+ }
|
|
|
|
+
|
2020-06-27 17:50:15 +02:00
|
|
|
+ public static int pistonPushLimit = 12;
|
|
|
|
+ private static void pistonPushLimit() {
|
2020-08-03 18:48:42 +02:00
|
|
|
+ pistonPushLimit = getInt("settings.pistonPushLimit", 12);
|
2020-06-27 17:50:15 +02:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
\ No newline at end of file
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PistonExtendsChecker.java b/src/main/java/net/minecraft/server/PistonExtendsChecker.java
|
2020-08-03 18:48:42 +02:00
|
|
|
index 95aeaaf0bb07c5ecf7117dae3382b0f0aac6426f..89385896af6f6088a9749a13ad5c1d0c581fa502 100644
|
2020-06-27 17:50:15 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PistonExtendsChecker.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PistonExtendsChecker.java
|
|
|
|
@@ -79,7 +79,7 @@ public class PistonExtendsChecker {
|
|
|
|
} else {
|
|
|
|
int i = 1;
|
|
|
|
|
|
|
|
- if (i + this.f.size() > 12) {
|
2020-08-03 18:48:42 +02:00
|
|
|
+ if (i + this.f.size() > dev.tr7zw.yatopia.YatopiaConfig.pistonPushLimit) { // Yatopia
|
2020-06-27 17:50:15 +02:00
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
while (a(block)) {
|
|
|
|
@@ -93,7 +93,7 @@ public class PistonExtendsChecker {
|
|
|
|
}
|
|
|
|
|
|
|
|
++i;
|
|
|
|
- if (i + this.f.size() > 12) {
|
2020-08-03 18:48:42 +02:00
|
|
|
+ if (i + this.f.size() > dev.tr7zw.yatopia.YatopiaConfig.pistonPushLimit) { // Yatopia
|
2020-06-27 17:50:15 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -141,7 +141,7 @@ public class PistonExtendsChecker {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (this.f.size() >= 12) {
|
2020-08-03 18:48:42 +02:00
|
|
|
+ if (this.f.size() >= dev.tr7zw.yatopia.YatopiaConfig.pistonPushLimit) { // Yatopia
|
2020-06-27 17:50:15 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|