From 200c8054c7f1a7929eb5d08021fc213b509d14b4 Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Sat, 10 Dec 2022 18:50:26 +0900 Subject: [PATCH] Fix #26 --- .../0032-Implement-Anti-Shulker-Dupe.patch | 54 ------------------- ...146-feat-Cure-effects-food-property.patch} | 0 ...Add-option-to-configure-portal-size.patch} | 0 ...API.patch => 0034-Force-despawn-API.patch} | 0 ...-allocs.patch => 0035-Reduce-allocs.patch} | 0 ...ch-Allow-any-characters-in-username.patch} | 8 +-- 6 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 patches/server/0032-Implement-Anti-Shulker-Dupe.patch rename patches/server/{0033-Purpur-PR-1146-feat-Cure-effects-food-property.patch => 0032-Purpur-PR-1146-feat-Cure-effects-food-property.patch} (100%) rename patches/server/{0034-Add-option-to-configure-portal-size.patch => 0033-Add-option-to-configure-portal-size.patch} (100%) rename patches/server/{0035-Force-despawn-API.patch => 0034-Force-despawn-API.patch} (100%) rename patches/server/{0036-Reduce-allocs.patch => 0035-Reduce-allocs.patch} (100%) rename patches/server/{0037-Rubia-patch-Allow-any-characters-in-username.patch => 0036-Rubia-patch-Allow-any-characters-in-username.patch} (90%) diff --git a/patches/server/0032-Implement-Anti-Shulker-Dupe.patch b/patches/server/0032-Implement-Anti-Shulker-Dupe.patch deleted file mode 100644 index f812e7e..0000000 --- a/patches/server/0032-Implement-Anti-Shulker-Dupe.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Sun, 6 Nov 2022 19:54:40 +0900 -Subject: [PATCH] Implement Anti Shulker Dupe - -Original: https://github.com/PotatoPresident/AntiShulkerDupe - -Copyright (c) 2021 Potatoboy9999 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java -index f4c47f7a7f2572dedbaee4890c98e1f3589a40c2..9fcd8f51ebd76a60b5f10322675c2a8b7cd33ccb 100644 ---- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java -@@ -148,6 +148,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock { - } - - }); -+ if (net.prismarineteam.prismarine.PrismarineConfig.antiShulkerDupe) shulkerBoxBlockEntity.clearContent(); // Prismarine - Anti Shulker Dupe - } - - return super.getDrops(state, builder); -diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java -index e696dd4588d8fca027bfa461a8a908927ed452bc..ecba9b47ed31a7bce579fce4bf3c568ccba95c0b 100644 ---- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java -+++ b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java -@@ -271,4 +271,9 @@ public class PrismarineConfig { - private static void offlineWarning() { - offlineWarning = getBoolean("settings.offline-warning", offlineWarning); - } -+ -+ public static boolean antiShulkerDupe = true; -+ private static void antiShulkerDupe() { -+ antiShulkerDupe = getBoolean("settings.anti-shulker-dupe", antiShulkerDupe); -+ } - } -\ No newline at end of file diff --git a/patches/server/0033-Purpur-PR-1146-feat-Cure-effects-food-property.patch b/patches/server/0032-Purpur-PR-1146-feat-Cure-effects-food-property.patch similarity index 100% rename from patches/server/0033-Purpur-PR-1146-feat-Cure-effects-food-property.patch rename to patches/server/0032-Purpur-PR-1146-feat-Cure-effects-food-property.patch diff --git a/patches/server/0034-Add-option-to-configure-portal-size.patch b/patches/server/0033-Add-option-to-configure-portal-size.patch similarity index 100% rename from patches/server/0034-Add-option-to-configure-portal-size.patch rename to patches/server/0033-Add-option-to-configure-portal-size.patch diff --git a/patches/server/0035-Force-despawn-API.patch b/patches/server/0034-Force-despawn-API.patch similarity index 100% rename from patches/server/0035-Force-despawn-API.patch rename to patches/server/0034-Force-despawn-API.patch diff --git a/patches/server/0036-Reduce-allocs.patch b/patches/server/0035-Reduce-allocs.patch similarity index 100% rename from patches/server/0036-Reduce-allocs.patch rename to patches/server/0035-Reduce-allocs.patch diff --git a/patches/server/0037-Rubia-patch-Allow-any-characters-in-username.patch b/patches/server/0036-Rubia-patch-Allow-any-characters-in-username.patch similarity index 90% rename from patches/server/0037-Rubia-patch-Allow-any-characters-in-username.patch rename to patches/server/0036-Rubia-patch-Allow-any-characters-in-username.patch index 528e11f..a693ca1 100644 --- a/patches/server/0037-Rubia-patch-Allow-any-characters-in-username.patch +++ b/patches/server/0036-Rubia-patch-Allow-any-characters-in-username.patch @@ -33,12 +33,12 @@ index 2b03274392300f89c634d3372c30a0fa0122ef85..0633090d9d1824e1c810c205a07ee0be // Paper start - validate usernames if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation) { diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java -index ecba9b47ed31a7bce579fce4bf3c568ccba95c0b..5a6ef0616782d3a6f3288193413169f5b0d9ac9f 100644 +index e696dd4588d8fca027bfa461a8a908927ed452bc..fe4bfd8af138384e1e8a0bbdeb6fd783314a7374 100644 --- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java +++ b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java -@@ -276,4 +276,9 @@ public class PrismarineConfig { - private static void antiShulkerDupe() { - antiShulkerDupe = getBoolean("settings.anti-shulker-dupe", antiShulkerDupe); +@@ -271,4 +271,9 @@ public class PrismarineConfig { + private static void offlineWarning() { + offlineWarning = getBoolean("settings.offline-warning", offlineWarning); } + + public static boolean allowAnyPlayerName = false;