From 04dd5cbf5e1360cfaad667b75296b49e5b1a4e9c Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Fri, 19 Mar 2021 18:25:18 +0100 Subject: [PATCH] [CI-SKIP] Ignore .gitignore A `.gitignore' will make packages such as `net.minecraft.world.entity.ai.goal.**target**` be ignored. This causes the entire patch to not apply, which is very suspicious. This commit adds a `--force' parameter to the `git add' command we run, as per `man git-add': ``` -f, --force Allow adding otherwise ignored files. ``` The global configuration file was proven problematic, then fixed by this by commit by Prof_Bloodstone#0123 and thekinrar#0001 on Discord (`#paper-dev'). CI-SKIP: This does not apply to the CI, therefore it is not worthy of its own build. --- scripts/importmcdev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index 6165a7195b..d438a5a5cf 100755 --- a/scripts/importmcdev.sh +++ b/scripts/importmcdev.sh @@ -121,6 +121,6 @@ importLibrary com.mojang datafixerupper com/mojang/serialization Dynamic.java set -e cd "$workdir/Spigot/Spigot-Server/" rm -rf nms-patches applyPatches.sh makePatches.sh >/dev/null 2>&1 -$gitcmd add . -A >/dev/null 2>&1 +$gitcmd add . --force -A >/dev/null 2>&1 echo -e "mc-dev Imports\n\n$MODLOG" | $gitcmd commit . -F - )