From f2f196dc79e8538fd686400b97667fdb0d6daf79 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Fri, 24 Jul 2020 14:25:40 -0400 Subject: [PATCH] Update GalaxiEngine --- Artifacts/SubServers.Patcher.sh | 4 ++-- SubServers.Bungee/pom.xml | 4 ++-- SubServers.Client/Bukkit/pom.xml | 2 +- .../Client/Bukkit/Library/Compatibility/PlaceholderImpl.java | 4 ++-- SubServers.Client/Sponge/pom.xml | 2 +- SubServers.Host/pom.xml | 2 +- SubServers.Sync/pom.xml | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Artifacts/SubServers.Patcher.sh b/Artifacts/SubServers.Patcher.sh index 1bdb0a80..7afd13a7 100644 --- a/Artifacts/SubServers.Patcher.sh +++ b/Artifacts/SubServers.Patcher.sh @@ -79,13 +79,13 @@ if [ $__RETURN -eq 0 ] fi yes | cp -rf . ../Patched.jar cd ../ - printf "Built-By: SubServers.Bungee.Patcher\n" >> MANIFEST.MF + printf "Built-By: SubServers.Patcher\n" >> MANIFEST.MF cp -f MANIFEST.MF Patched.jar/META-INF if [ -f "Patched.jar/bungee.yml" ]; then rm -Rf Patched.jar/bungee.yml fi if [ ! -f "MODIFICATIONS" ]; then - printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n" > MODIFICATIONS + printf "# SubServers.Patcher generated difference list (may be empty if git is not installed)\n#\n" > MODIFICATIONS fi printf "@ `date`\n> git --no-pager diff --no-index --name-status SubServers.Patcher/Original.jar SubServers.Patcher/Patched.jar\n" >> MODIFICATIONS git --no-pager diff --no-index --name-status Original.jar Patched.jar | sed -e "s/\tOriginal.jar\//\t\//" -e "s/\tPatched.jar\//\t\//" >> MODIFICATIONS diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 58da5118..906819f6 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 20w28a + 20w30a compile true net.ME1312.Galaxi GalaxiEngine - 20w28a + 20w30a provided diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index 926904aa..de9f9b36 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -48,7 +48,7 @@ net.ME1312.Galaxi GalaxiUtil - 20w28a + 20w30a compile true diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java index 0b43fbb2..a7d94118 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java @@ -203,8 +203,8 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C values[0] = text.substring(0, start); text = text.substring(start); - int[] open = {'(', '[', '{'}; - int[] close = {')', ']', '}'}; + int[] open = {'(', '{'}; + int[] close = {')', '}'}; Arrays.sort(open); Arrays.sort(close); diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index a5317e01..843dfae6 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -30,7 +30,7 @@ net.ME1312.Galaxi GalaxiUtil - 20w28a + 20w30a compile true diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 5b2e12d2..427c3af0 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -20,7 +20,7 @@ net.ME1312.Galaxi GalaxiEngine - 20w28a + 20w30a compile true diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml index 0867cfc7..5d6a9aae 100644 --- a/SubServers.Sync/pom.xml +++ b/SubServers.Sync/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 20w28a + 20w30a compile true net.ME1312.Galaxi GalaxiEngine - 20w28a + 20w30a provided