From 42720aa1a7f5d5c3475590924dcbdd973f71ab9d Mon Sep 17 00:00:00 2001
From: ishland <ishlandmc@yeah.net>
Date: Thu, 28 Jan 2021 10:29:57 +0800
Subject: [PATCH] Drop sand duping

---
 PATCHES.md                                    |  1 -
 .../src/main/kotlin/task/RebuildPatches.kt    |  7 +++-
 .../0062-add-config-for-sand-duping.patch     | 41 -------------------
 ...2-lithium-cache-chunk-gen-sea-level.patch} |  0
 ...perPR-Inline-shift-direction-fields.patch} |  0
 ...t-cache.patch => 0064-New-nbt-cache.patch} |  0
 ...0065-Detailed-lag-and-crash-reports.patch} |  0
 7 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 patches/server/0062-add-config-for-sand-duping.patch
 rename patches/server/{0063-lithium-cache-chunk-gen-sea-level.patch => 0062-lithium-cache-chunk-gen-sea-level.patch} (100%)
 rename patches/server/{0064-PaperPR-Inline-shift-direction-fields.patch => 0063-PaperPR-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0065-New-nbt-cache.patch => 0064-New-nbt-cache.patch} (100%)
 rename patches/server/{0066-Detailed-lag-and-crash-reports.patch => 0065-Detailed-lag-and-crash-reports.patch} (100%)

diff --git a/PATCHES.md b/PATCHES.md
index ec60f220..bff0e27d 100644
--- a/PATCHES.md
+++ b/PATCHES.md
@@ -367,7 +367,6 @@ # Patches
 | server |  Zombie break door minimum difficulty option      | BillyGalbreath |  |
 | server |  Zombie horse naturally spawn      | William Blake Galbreath |  |
 | server |  add config for logging login location      | Simon Gardling |  |
-| server |  add config for sand duping      | Simon Gardling |  |
 | server |  dont load chunks for physics      | Aikar |  |
 | server |  lithium DataTrackerMixin      | JellySquid | tr7zw |
 | server |  lithium HashedList      | JellySquid |  |
diff --git a/buildSrc/src/main/kotlin/task/RebuildPatches.kt b/buildSrc/src/main/kotlin/task/RebuildPatches.kt
index b44a7159..afaa2d98 100644
--- a/buildSrc/src/main/kotlin/task/RebuildPatches.kt
+++ b/buildSrc/src/main/kotlin/task/RebuildPatches.kt
@@ -70,7 +70,12 @@ private fun Project.updatePatches(
             "--no-stat", "--zero-commit", "--full-index", "--no-signature", "-N",
             "-o", patchPath.absolutePath, previousUpstreamName,
             dir = projectDir,
-            printOut = true
+            printOut = false
         )
     )
+    gitCmd(
+        "add", patchPath.canonicalPath,
+        dir = patchPath,
+        printOut = true
+    )
 }
diff --git a/patches/server/0062-add-config-for-sand-duping.patch b/patches/server/0062-add-config-for-sand-duping.patch
deleted file mode 100644
index 43099270..00000000
--- a/patches/server/0062-add-config-for-sand-duping.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Simon Gardling <titaniumtown@gmail.com>
-Date: Sat, 23 Jan 2021 19:17:51 -0500
-Subject: [PATCH] add config for sand duping
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 76aac1b131f314775e418339e434f4f2da2ad619..46aef6e142c7ec0cf2d4ac53a2db4987db6d0d71 100644
---- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
-+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -65,7 +65,7 @@ public class EntityFallingBlock extends Entity {
-     @Override
-     public void tick() {
-         // Paper start - fix sand duping
--        if (this.dead) {
-+        if (!org.yatopiamc.yatopia.server.YatopiaConfig.allowSandDupe && this.dead) { // Yatopia - add config for sand dupe
-             return;
-         }
-         // Paper end - fix sand duping
-@@ -92,7 +92,7 @@ public class EntityFallingBlock extends Entity {
-             this.move(EnumMoveType.SELF, this.getMot());
- 
-             // Paper start - fix sand duping
--            if (this.dead) {
-+            if (!org.yatopiamc.yatopia.server.YatopiaConfig.allowSandDupe && this.dead) { // Yatopia - add config for sand dupe
-                 return;
-             }
-             // Paper end - fix sand duping
-diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
-index 15e2fa125bc293b954cceb5b1fbcec7fade3e4db..eb4afe26ff5e436cf08513f512ebdf126407b6ae 100644
---- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
-+++ b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
-@@ -276,4 +276,8 @@ public class YatopiaConfig {
-         fixProtocolLib = getBoolean("settings.fix-protocollib", fixProtocolLib);
-     }
- 
-+    public static boolean allowSandDupe = false;
-+    private static void sandDupe() {
-+        allowSandDupe = getBoolean("settings.allow-sand-dupe", allowSandDupe);
-+    }
- }
diff --git a/patches/server/0063-lithium-cache-chunk-gen-sea-level.patch b/patches/server/0062-lithium-cache-chunk-gen-sea-level.patch
similarity index 100%
rename from patches/server/0063-lithium-cache-chunk-gen-sea-level.patch
rename to patches/server/0062-lithium-cache-chunk-gen-sea-level.patch
diff --git a/patches/server/0064-PaperPR-Inline-shift-direction-fields.patch b/patches/server/0063-PaperPR-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0064-PaperPR-Inline-shift-direction-fields.patch
rename to patches/server/0063-PaperPR-Inline-shift-direction-fields.patch
diff --git a/patches/server/0065-New-nbt-cache.patch b/patches/server/0064-New-nbt-cache.patch
similarity index 100%
rename from patches/server/0065-New-nbt-cache.patch
rename to patches/server/0064-New-nbt-cache.patch
diff --git a/patches/server/0066-Detailed-lag-and-crash-reports.patch b/patches/server/0065-Detailed-lag-and-crash-reports.patch
similarity index 100%
rename from patches/server/0066-Detailed-lag-and-crash-reports.patch
rename to patches/server/0065-Detailed-lag-and-crash-reports.patch