From c61086ff4f0a15075dc52a3f872cc8944b8eea27 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Thu, 3 Jul 2025 17:35:31 -0700 Subject: [PATCH] Update Paper submodule --- .gitmodules | 2 +- base/Paper | 2 +- patches/server/0002-This-is-SportPaper.patch | 135 ++++----- .../server/0194-Update-MySQL-Connector.patch | 8 +- ...208-Disable-log4j-message-formatting.patch | 26 -- ...g.patch => 0208-Fix-chunk-unloading.patch} | 4 +- ...dd-events-for-water-source-creation.patch} | 4 +- .../server/0209-Upgrade-log4j-version.patch | 277 ------------------ ...-explosion-knockback-to-projectiles.patch} | 4 +- ...s.patch => 0211-Patch-Book-Exploits.patch} | 4 +- ...patch => 0212-Update-to-Netty-4.1.x.patch} | 6 +- ...per-thread-native-byte-buffer-cache.patch} | 4 +- ...th-some-packets-that-use-entity-id-.patch} | 4 +- ...5-Resolve-build-issues-with-Java-17.patch} | 10 +- ...-Add-setting-to-check-line-of-sight.patch} | 4 +- ...217-Make-critical-hits-configurable.patch} | 4 +- ...Optimize-networking-by-using-IP_TOS.patch} | 4 +- ...0219-Add-Unix-domain-socket-support.patch} | 4 +- ...tch => 0220-Fix-east-west-cannoning.patch} | 4 +- ...Remove-hacky-stackable-buckets-code.patch} | 4 +- ...0222-Make-dimension-field-non-final.patch} | 4 +- .../0223-Update-several-build-plugins.patch | 55 ++++ ...ention-for-BlockDispenseEntityEvent.patch} | 4 +- .../0225-Update-several-build-plugins.patch | 168 ----------- 24 files changed, 159 insertions(+), 586 deletions(-) delete mode 100644 patches/server/0208-Disable-log4j-message-formatting.patch rename patches/server/{0210-Fix-chunk-unloading.patch => 0208-Fix-chunk-unloading.patch} (93%) rename patches/server/{0211-Add-events-for-water-source-creation.patch => 0209-Add-events-for-water-source-creation.patch} (98%) delete mode 100644 patches/server/0209-Upgrade-log4j-version.patch rename patches/server/{0212-Apply-explosion-knockback-to-projectiles.patch => 0210-Apply-explosion-knockback-to-projectiles.patch} (95%) rename patches/server/{0213-Patch-Book-Exploits.patch => 0211-Patch-Book-Exploits.patch} (98%) rename patches/server/{0214-Update-to-Netty-4.1.x.patch => 0212-Update-to-Netty-4.1.x.patch} (98%) rename patches/server/{0215-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0213-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (95%) rename patches/server/{0216-Prevent-desync-with-some-packets-that-use-entity-id-.patch => 0214-Prevent-desync-with-some-packets-that-use-entity-id-.patch} (93%) rename patches/server/{0217-Resolve-build-issues-with-Java-17.patch => 0215-Resolve-build-issues-with-Java-17.patch} (91%) rename patches/server/{0218-Add-setting-to-check-line-of-sight.patch => 0216-Add-setting-to-check-line-of-sight.patch} (95%) rename patches/server/{0219-Make-critical-hits-configurable.patch => 0217-Make-critical-hits-configurable.patch} (95%) rename patches/server/{0220-Optimize-networking-by-using-IP_TOS.patch => 0218-Optimize-networking-by-using-IP_TOS.patch} (93%) rename patches/server/{0221-Add-Unix-domain-socket-support.patch => 0219-Add-Unix-domain-socket-support.patch} (99%) rename patches/server/{0222-Fix-east-west-cannoning.patch => 0220-Fix-east-west-cannoning.patch} (97%) rename patches/server/{0223-Remove-hacky-stackable-buckets-code.patch => 0221-Remove-hacky-stackable-buckets-code.patch} (97%) rename patches/server/{0224-Make-dimension-field-non-final.patch => 0222-Make-dimension-field-non-final.patch} (93%) create mode 100644 patches/server/0223-Update-several-build-plugins.patch rename patches/server/{0226-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch => 0224-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch} (94%) delete mode 100644 patches/server/0225-Update-several-build-plugins.patch diff --git a/.gitmodules b/.gitmodules index b73ebc93f..41f2350fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "Paper"] path = base/Paper - url = https://github.com/PaperMC/Paper.git + url = https://github.com/PaperMC/Paper-archive.git branch = ver/1.8.8 [submodule "builddata"] path = builddata diff --git a/base/Paper b/base/Paper index 4c7641d19..2894af04d 160000 --- a/base/Paper +++ b/base/Paper @@ -1 +1 @@ -Subproject commit 4c7641d1919222fdf02903bc529af1d6cbbe6146 +Subproject commit 2894af04dc378d6a61e55e37a8c0b1a478c09c3d diff --git a/patches/server/0002-This-is-SportPaper.patch b/patches/server/0002-This-is-SportPaper.patch index a5befc69f..260e8258e 100644 --- a/patches/server/0002-This-is-SportPaper.patch +++ b/patches/server/0002-This-is-SportPaper.patch @@ -1,4 +1,4 @@ -From bec48f109af4a7e0e4dc562fcc44857b68a2f0d6 Mon Sep 17 00:00:00 2001 +From b8791ddf31e3c636367c29fd8f078e5fdcbb48e5 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Mon, 16 Oct 2017 11:45:28 -0500 Subject: [PATCH] This is SportPaper @@ -6,7 +6,7 @@ Subject: [PATCH] This is SportPaper Also includes some legacy mc-dev imports diff --git a/pom.xml b/pom.xml -index 6aaba5027..5d6a6dba4 100644 +index 644305e6..bc242390 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ @@ -48,20 +48,10 @@ index 6aaba5027..5d6a6dba4 100644 ${project.version} jar compile -@@ -100,7 +98,7 @@ - - - destroystokyo -- https://ci.destroystokyo.com/plugin/repository/everything/ -+ https://papermc.io/repo/repository/maven-public/ - - - -@@ -108,23 +106,61 @@ - +@@ -115,22 +113,60 @@ install -- + - com.lukegb.mojo - gitdescribe-maven-plugin - 1.3 @@ -78,65 +68,64 @@ index 6aaba5027..5d6a6dba4 100644 - - - -+ -+ net.md-5 -+ scriptus -+ 0.4.1 -+ -+ -+ ex-sport -+ -+ git-SportPaper-%s -+ ../ -+ sportpaper.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ ex-paper -+ -+ -P.%s -+ ../base/Paper/PaperSpigot-Server -+ paper.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ ex-spigot -+ -+ -SP.%s -+ ../base/Paper/Spigot-Server -+ spigot.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ ex-craftbukkit -+ -+ -CB.%s -+ ../base/Paper/CraftBukkit -+ craftbukkit.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ ++ net.md-5 ++ scriptus ++ 0.4.1 ++ ++ ++ ex-sport ++ ++ git-SportPaper-%s ++ ../ ++ sportpaper.desc ++ ++ initialize ++ ++ describe ++ ++ ++ ++ ex-paper ++ ++ -P.%s ++ ../base/Paper/PaperSpigot-Server ++ paper.desc ++ ++ initialize ++ ++ describe ++ ++ ++ ++ ex-spigot ++ ++ -SP.%s ++ ../base/Paper/Spigot-Server ++ spigot.desc ++ ++ initialize ++ ++ describe ++ ++ ++ ++ ex-craftbukkit ++ ++ -CB.%s ++ ../base/Paper/CraftBukkit ++ craftbukkit.desc ++ ++ initialize ++ ++ describe ++ ++ ++ ++ org.apache.maven.plugins maven-jar-plugin -@@ -135,7 +171,7 @@ +@@ -141,7 +177,7 @@ org.bukkit.craftbukkit.Main CraftBukkit @@ -146,7 +135,7 @@ index 6aaba5027..5d6a6dba4 100644 Bukkit ${api.version} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b400ce04d..bbca20fa0 100644 +index b400ce04..bbca20fa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1084,7 +1084,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -159,7 +148,7 @@ index b400ce04d..bbca20fa0 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 3a4b14246..36bb612a9 100644 +index 3a4b1424..36bb612a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -172,5 +161,5 @@ index 3a4b14246..36bb612a9 100644 if (stream != null) { -- -2.30.2 +2.50.0 diff --git a/patches/server/0194-Update-MySQL-Connector.patch b/patches/server/0194-Update-MySQL-Connector.patch index 646035359..64e83f5d5 100644 --- a/patches/server/0194-Update-MySQL-Connector.patch +++ b/patches/server/0194-Update-MySQL-Connector.patch @@ -1,14 +1,14 @@ -From 8f44896ae94500d9533a5b8bf884e5e505fc475c Mon Sep 17 00:00:00 2001 +From ef4ce39e89a038ec0d39e8f238dfc6d333d25a33 Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Tue, 15 Dec 2020 18:59:08 +0200 Subject: [PATCH] Update MySQL Connector diff --git a/pom.xml b/pom.xml -index 6a9d969e..404eb178 100644 +index a2f665c1..d8e35ef2 100644 --- a/pom.xml +++ b/pom.xml -@@ -75,7 +75,7 @@ +@@ -81,7 +81,7 @@ mysql mysql-connector-java @@ -18,5 +18,5 @@ index 6a9d969e..404eb178 100644 compile -- -2.25.1 +2.50.0 diff --git a/patches/server/0208-Disable-log4j-message-formatting.patch b/patches/server/0208-Disable-log4j-message-formatting.patch deleted file mode 100644 index 4f65b0c04..000000000 --- a/patches/server/0208-Disable-log4j-message-formatting.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9e1fc71688bd80e8c75f5f719e86f4bfe5079139 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Fri, 10 Dec 2021 07:53:20 +1100 -Subject: [PATCH] Disable log4j message formatting - - -diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index f37d1c2d..0452fbc0 100644 ---- a/src/main/resources/log4j2.xml -+++ b/src/main/resources/log4j2.xml -@@ -3,10 +3,10 @@ - - - -- -+ - - -- -+ - - - --- -2.34.1 - diff --git a/patches/server/0210-Fix-chunk-unloading.patch b/patches/server/0208-Fix-chunk-unloading.patch similarity index 93% rename from patches/server/0210-Fix-chunk-unloading.patch rename to patches/server/0208-Fix-chunk-unloading.patch index 983b89bec..546cd6ef6 100644 --- a/patches/server/0210-Fix-chunk-unloading.patch +++ b/patches/server/0208-Fix-chunk-unloading.patch @@ -1,4 +1,4 @@ -From 827e396174f52fe04ebeed7ef0a930ad653b5805 Mon Sep 17 00:00:00 2001 +From c3f8a64344bff6a1cc78d0a9ad170a3254f53127 Mon Sep 17 00:00:00 2001 From: applenick Date: Wed, 29 Dec 2021 16:09:42 -0800 Subject: [PATCH] Fix chunk unloading @@ -27,5 +27,5 @@ index 550d824e..812686d5 100644 public IChunkProvider chunkProvider; private IChunkLoader chunkLoader; -- -2.32.0 (Apple Git-132) +2.50.0 diff --git a/patches/server/0211-Add-events-for-water-source-creation.patch b/patches/server/0209-Add-events-for-water-source-creation.patch similarity index 98% rename from patches/server/0211-Add-events-for-water-source-creation.patch rename to patches/server/0209-Add-events-for-water-source-creation.patch index 681a200e3..ee9f0bdb6 100644 --- a/patches/server/0211-Add-events-for-water-source-creation.patch +++ b/patches/server/0209-Add-events-for-water-source-creation.patch @@ -1,4 +1,4 @@ -From bc723759409412b6e0964f958f8c5d5ba681bb10 Mon Sep 17 00:00:00 2001 +From 55881638d6be1b199750687e0eae2f060723d195 Mon Sep 17 00:00:00 2001 From: OhPointFive Date: Thu, 7 Jul 2022 00:33:31 -0400 Subject: [PATCH] Add events for water source creation @@ -80,5 +80,5 @@ index be8bb5be..cc4d7319 100644 world.setAir(blockposition); } else { -- -2.39.1 +2.50.0 diff --git a/patches/server/0209-Upgrade-log4j-version.patch b/patches/server/0209-Upgrade-log4j-version.patch deleted file mode 100644 index 1cbe872fb..000000000 --- a/patches/server/0209-Upgrade-log4j-version.patch +++ /dev/null @@ -1,277 +0,0 @@ -From 3df98e5dc52f42fb3205872b240a8744f3d1d1ff Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Fri, 10 Dec 2021 12:22:45 +1100 -Subject: [PATCH] Upgrade log4j version - - -diff --git a/pom.xml b/pom.xml -index 4c3a52a8..2dee42e5 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -44,6 +44,12 @@ - jar - compile - -+ -+ org.apache.logging.log4j -+ log4j-core -+ 2.8.1 -+ compile -+ - - org.spigotmc - minecraft-server -diff --git a/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java -deleted file mode 100644 -index 341eaa33..00000000 ---- a/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java -+++ /dev/null -@@ -1,245 +0,0 @@ --/* -- * Licensed to the Apache Software Foundation (ASF) under one or more -- * contributor license agreements. See the NOTICE file distributed with -- * this work for additional information regarding copyright ownership. -- * The ASF licenses this file to You under the Apache license, Version 2.0 -- * (the "License"); you may not use this file except in compliance with -- * the License. You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the license for the specific language governing permissions and -- * limitations under the license. -- */ --package org.apache.logging.log4j.core.appender; -- --import java.io.IOException; --import java.io.OutputStream; --import java.io.PrintStream; --import java.io.Serializable; --import java.io.UnsupportedEncodingException; --import java.lang.reflect.Constructor; --import java.nio.charset.Charset; -- --import org.apache.logging.log4j.core.Filter; --import org.apache.logging.log4j.core.Layout; --import org.apache.logging.log4j.core.config.plugins.Plugin; --import org.apache.logging.log4j.core.config.plugins.PluginAttribute; --import org.apache.logging.log4j.core.config.plugins.PluginElement; --import org.apache.logging.log4j.core.config.plugins.PluginFactory; --import org.apache.logging.log4j.core.helpers.Booleans; --import org.apache.logging.log4j.core.helpers.Loader; --import org.apache.logging.log4j.core.layout.PatternLayout; --import org.apache.logging.log4j.util.PropertiesUtil; -- --/** -- * ConsoleAppender appends log events to System.out or -- * System.err using a layout specified by the user. The -- * default target is System.out. -- * @doubt accessing System.out or .err as a byte stream instead of a writer -- * bypasses the JVM's knowledge of the proper encoding. (RG) Encoding -- * is handled within the Layout. Typically, a Layout will generate a String -- * and then call getBytes which may use a configured encoding or the system -- * default. OTOH, a Writer cannot print byte streams. -- */ --@Plugin(name = "Console", category = "Core", elementType = "appender", printObject = true) --public final class ConsoleAppender extends AbstractOutputStreamAppender { -- -- private static final String JANSI_CLASS = "org.fusesource.jansi.WindowsAnsiOutputStream"; -- private static ConsoleManagerFactory factory = new ConsoleManagerFactory(); -- -- /** -- * Enumeration of console destinations. -- */ -- public enum Target { -- /** Standard output. */ -- SYSTEM_OUT, -- /** Standard error output. */ -- SYSTEM_ERR -- } -- -- private ConsoleAppender(final String name, final Layout layout, final Filter filter, -- final OutputStreamManager manager, -- final boolean ignoreExceptions) { -- super(name, layout, filter, ignoreExceptions, true, manager); -- } -- -- /** -- * Create a Console Appender. -- * @param layout The layout to use (required). -- * @param filter The Filter or null. -- * @param t The target ("SYSTEM_OUT" or "SYSTEM_ERR"). The default is "SYSTEM_OUT". -- * @param follow If true will follow changes to the underlying output stream. -- * @param name The name of the Appender (required). -- * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise -- * they are propagated to the caller. -- * @return The ConsoleAppender. -- */ -- @PluginFactory -- public static ConsoleAppender createAppender( -- @PluginElement("Layout") Layout layout, -- @PluginElement("Filters") final Filter filter, -- @PluginAttribute("target") final String t, -- @PluginAttribute("name") final String name, -- @PluginAttribute("follow") final String follow, -- @PluginAttribute("ignoreExceptions") final String ignore) { -- if (name == null) { -- LOGGER.error("No name provided for ConsoleAppender"); -- return null; -- } -- if (layout == null) { -- layout = PatternLayout.createLayout(null, null, null, null, null); -- } -- final boolean isFollow = Boolean.parseBoolean(follow); -- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true); -- final Target target = t == null ? Target.SYSTEM_OUT : Target.valueOf(t); -- return new ConsoleAppender(name, layout, filter, getManager(isFollow, target, layout), ignoreExceptions); -- } -- -- private static OutputStreamManager getManager(final boolean follow, final Target target, final Layout layout) { -- final String type = target.name(); -- final OutputStream os = getOutputStream(follow, target); -- return OutputStreamManager.getManager(target.name() + "." + follow, new FactoryData(os, type, layout), factory); -- } -- -- private static OutputStream getOutputStream(final boolean follow, final Target target) { -- final String enc = Charset.defaultCharset().name(); -- PrintStream printStream = null; -- try { -- printStream = target == Target.SYSTEM_OUT ? -- follow ? new PrintStream(new SystemOutStream(), true, enc) : System.out : -- follow ? new PrintStream(new SystemErrStream(), true, enc) : System.err; -- } catch (final UnsupportedEncodingException ex) { // should never happen -- throw new IllegalStateException("Unsupported default encoding " + enc, ex); -- } -- final PropertiesUtil propsUtil = PropertiesUtil.getProperties(); -- if (!propsUtil.getStringProperty("os.name").startsWith("Windows") || -- propsUtil.getBooleanProperty("log4j.skipJansi")) { -- return printStream; -- } -- try { -- final ClassLoader loader = Loader.getClassLoader(); -- // We type the parameter as a wildcard to avoid a hard reference to Jansi. -- final Class clazz = loader.loadClass(JANSI_CLASS); -- final Constructor constructor = clazz.getConstructor(OutputStream.class); -- return (OutputStream) constructor.newInstance(printStream); -- } catch (final ClassNotFoundException cnfe) { -- LOGGER.debug("Jansi is not installed, cannot find {}", JANSI_CLASS); -- } catch (final NoSuchMethodException nsme) { -- LOGGER.warn("{} is missing the proper constructor", JANSI_CLASS); -- } catch (final Throwable ex) { // CraftBukkit - Exception -> Throwable -- LOGGER.warn("Unable to instantiate {}", JANSI_CLASS); -- } -- return printStream; -- } -- -- /** -- * An implementation of OutputStream that redirects to the current System.err. -- */ -- private static class SystemErrStream extends OutputStream { -- public SystemErrStream() { -- } -- -- @Override -- public void close() { -- // do not close sys err! -- } -- -- @Override -- public void flush() { -- System.err.flush(); -- } -- -- @Override -- public void write(final byte[] b) throws IOException { -- System.err.write(b); -- } -- -- @Override -- public void write(final byte[] b, final int off, final int len) -- throws IOException { -- System.err.write(b, off, len); -- } -- -- @Override -- public void write(final int b) { -- System.err.write(b); -- } -- } -- -- /** -- * An implementation of OutputStream that redirects to the current System.out. -- */ -- private static class SystemOutStream extends OutputStream { -- public SystemOutStream() { -- } -- -- @Override -- public void close() { -- // do not close sys out! -- } -- -- @Override -- public void flush() { -- System.out.flush(); -- } -- -- @Override -- public void write(final byte[] b) throws IOException { -- System.out.write(b); -- } -- -- @Override -- public void write(final byte[] b, final int off, final int len) -- throws IOException { -- System.out.write(b, off, len); -- } -- -- @Override -- public void write(final int b) throws IOException { -- System.out.write(b); -- } -- } -- -- /** -- * Data to pass to factory method. -- */ -- private static class FactoryData { -- private final OutputStream os; -- private final String type; -- private final Layout layout; -- -- /** -- * Constructor. -- * @param os The OutputStream. -- * @param type The name of the target. -- * @param layout A Serializable layout -- */ -- public FactoryData(final OutputStream os, final String type, final Layout layout) { -- this.os = os; -- this.type = type; -- this.layout = layout; -- } -- } -- -- /** -- * Factory to create the Appender. -- */ -- private static class ConsoleManagerFactory implements ManagerFactory { -- -- /** -- * Create an OutputStreamManager. -- * @param name The name of the entity to manage. -- * @param data The data required to create the entity. -- * @return The OutputStreamManager -- */ -- @Override -- public OutputStreamManager createManager(final String name, final FactoryData data) { -- return new OutputStreamManager(data.os, data.type, data.layout); -- } -- } -- --} --- -2.34.1 - diff --git a/patches/server/0212-Apply-explosion-knockback-to-projectiles.patch b/patches/server/0210-Apply-explosion-knockback-to-projectiles.patch similarity index 95% rename from patches/server/0212-Apply-explosion-knockback-to-projectiles.patch rename to patches/server/0210-Apply-explosion-knockback-to-projectiles.patch index 7670e696a..b82ec0dd8 100644 --- a/patches/server/0212-Apply-explosion-knockback-to-projectiles.patch +++ b/patches/server/0210-Apply-explosion-knockback-to-projectiles.patch @@ -1,4 +1,4 @@ -From 6d14e77948d1ea5f80ca8d55030901b1351ab31a Mon Sep 17 00:00:00 2001 +From 6d52b135af7093ac872627ccca6b8e14cba8da05 Mon Sep 17 00:00:00 2001 From: woofdoggo Date: Wed, 11 May 2022 16:49:54 -0400 Subject: [PATCH] Apply explosion knockback to projectiles @@ -23,5 +23,5 @@ index 0d6ccbf7..e90b1c23 100644 double d14 = entity instanceof EntityHuman && world.paperSpigotConfig.disableExplosionKnockback ? 0 : EnchantmentProtection.a(entity, d13); // PaperSpigot -- -2.39.1 +2.50.0 diff --git a/patches/server/0213-Patch-Book-Exploits.patch b/patches/server/0211-Patch-Book-Exploits.patch similarity index 98% rename from patches/server/0213-Patch-Book-Exploits.patch rename to patches/server/0211-Patch-Book-Exploits.patch index 06bfd0e87..89a5b5fd1 100644 --- a/patches/server/0213-Patch-Book-Exploits.patch +++ b/patches/server/0211-Patch-Book-Exploits.patch @@ -1,4 +1,4 @@ -From 720e469e8fb7cfeb3710e72294f8ff32edd2ddcc Mon Sep 17 00:00:00 2001 +From 25d6b50e7ed5f93408238d455c7d240e607fd3d4 Mon Sep 17 00:00:00 2001 From: linsaftw Date: Sun, 25 Apr 2021 11:53:18 -0300 Subject: [PATCH] Patch Book Exploits @@ -148,5 +148,5 @@ index 0b5ada01..4175501d 100644 private boolean isValidPage(int page) { -- -2.39.1 +2.50.0 diff --git a/patches/server/0214-Update-to-Netty-4.1.x.patch b/patches/server/0212-Update-to-Netty-4.1.x.patch similarity index 98% rename from patches/server/0214-Update-to-Netty-4.1.x.patch rename to patches/server/0212-Update-to-Netty-4.1.x.patch index 69aaca98a..4a9ade955 100644 --- a/patches/server/0214-Update-to-Netty-4.1.x.patch +++ b/patches/server/0212-Update-to-Netty-4.1.x.patch @@ -1,11 +1,11 @@ -From 0325b9e8caeded0950255f34ede21315daf7217c Mon Sep 17 00:00:00 2001 +From fba402aaeddb102e5c129501882793e896546082 Mon Sep 17 00:00:00 2001 From: hpfxd Date: Wed, 27 Oct 2021 06:29:44 -0400 Subject: [PATCH] Update to Netty 4.1.x diff --git a/pom.xml b/pom.xml -index 2dee42e5..e6bdad05 100644 +index d8e35ef2..a52663c2 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,11 @@ @@ -316,5 +316,5 @@ index e2eb3054..9a075fef 100644 + // SportPaper end } -- -2.39.1 +2.50.0 diff --git a/patches/server/0215-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0213-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 95% rename from patches/server/0215-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0213-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index f638b66b0..c439e5bed 100644 --- a/patches/server/0215-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0213-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -1,4 +1,4 @@ -From 8aee7038640e23b9c81a6f2668fc391dd4a82849 Mon Sep 17 00:00:00 2001 +From 11628b5e8bc8e45a9259bc18452ba1830dfd40dd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 31 Oct 2021 09:46:32 -0400 Subject: [PATCH] Set cap on JDK per-thread native byte buffer cache @@ -29,5 +29,5 @@ index d1ce7a86..737904d4 100644 { acceptsAll(asList("?", "help"), "Show the help"); -- -2.39.1 +2.50.0 diff --git a/patches/server/0216-Prevent-desync-with-some-packets-that-use-entity-id-.patch b/patches/server/0214-Prevent-desync-with-some-packets-that-use-entity-id-.patch similarity index 93% rename from patches/server/0216-Prevent-desync-with-some-packets-that-use-entity-id-.patch rename to patches/server/0214-Prevent-desync-with-some-packets-that-use-entity-id-.patch index 1a01829c2..e16811f26 100644 --- a/patches/server/0216-Prevent-desync-with-some-packets-that-use-entity-id-.patch +++ b/patches/server/0214-Prevent-desync-with-some-packets-that-use-entity-id-.patch @@ -1,4 +1,4 @@ -From 2fc8b01269746bd5ac029cbeac1a26686acfd410 Mon Sep 17 00:00:00 2001 +From 94e6ab0c4157a9752098f057494412fb20a2af0c Mon Sep 17 00:00:00 2001 From: theFoxley <7950977+theFoxley@users.noreply.github.com> Date: Sat, 21 Jan 2023 22:54:41 +0100 Subject: [PATCH] Prevent desync with some packets that use entity id and check @@ -20,5 +20,5 @@ index 9ab157cd..0d95a296 100644 public double j; public boolean k; public boolean blocksEntitySpawning() { return k; } // Paper - OBFHELPER -- -2.37.2 +2.50.0 diff --git a/patches/server/0217-Resolve-build-issues-with-Java-17.patch b/patches/server/0215-Resolve-build-issues-with-Java-17.patch similarity index 91% rename from patches/server/0217-Resolve-build-issues-with-Java-17.patch rename to patches/server/0215-Resolve-build-issues-with-Java-17.patch index 359edd45a..31dd7cf8c 100644 --- a/patches/server/0217-Resolve-build-issues-with-Java-17.patch +++ b/patches/server/0215-Resolve-build-issues-with-Java-17.patch @@ -1,4 +1,4 @@ -From 035add76003f231d327e10fd7718411140e61b18 Mon Sep 17 00:00:00 2001 +From 8385e00a18e6f82355cc012a6d90f9635761eed5 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Mon, 6 Feb 2023 23:30:48 -0800 Subject: [PATCH] Resolve build issues with Java 17 @@ -6,7 +6,7 @@ Subject: [PATCH] Resolve build issues with Java 17 https://github.com/CobbleSword/NachoSpigot/commit/944e02c131b4f4f12a3140778fc9d681f773ae2c diff --git a/pom.xml b/pom.xml -index e6bdad05..6959c62a 100644 +index a52663c2..4aff3f3d 100644 --- a/pom.xml +++ b/pom.xml @@ -105,12 +105,7 @@ @@ -21,8 +21,8 @@ index e6bdad05..6959c62a 100644 - - destroystokyo -@@ -281,22 +276,7 @@ + papermc +@@ -292,22 +287,7 @@ org.apache.maven.plugins maven-compiler-plugin @@ -46,5 +46,5 @@ index e6bdad05..6959c62a 100644 org.apache.maven.plugins -- -2.39.1 +2.50.0 diff --git a/patches/server/0218-Add-setting-to-check-line-of-sight.patch b/patches/server/0216-Add-setting-to-check-line-of-sight.patch similarity index 95% rename from patches/server/0218-Add-setting-to-check-line-of-sight.patch rename to patches/server/0216-Add-setting-to-check-line-of-sight.patch index 8ad45edb9..7388effe6 100644 --- a/patches/server/0218-Add-setting-to-check-line-of-sight.patch +++ b/patches/server/0216-Add-setting-to-check-line-of-sight.patch @@ -1,4 +1,4 @@ -From 2ec0a95c46a09efb7a92dd200185ac850a5a6c1d Mon Sep 17 00:00:00 2001 +From 5d8c30c1395a04e3c88d0d7695e50f8fc4f7f5b0 Mon Sep 17 00:00:00 2001 From: halfmaster1 Date: Wed, 5 May 2021 02:20:01 -0400 Subject: [PATCH] Add setting to check line of sight @@ -32,5 +32,5 @@ index 8d58d1f3..ca028d04 100644 + } -- -2.39.2 +2.50.0 diff --git a/patches/server/0219-Make-critical-hits-configurable.patch b/patches/server/0217-Make-critical-hits-configurable.patch similarity index 95% rename from patches/server/0219-Make-critical-hits-configurable.patch rename to patches/server/0217-Make-critical-hits-configurable.patch index cbd684839..34c2aa112 100644 --- a/patches/server/0219-Make-critical-hits-configurable.patch +++ b/patches/server/0217-Make-critical-hits-configurable.patch @@ -1,4 +1,4 @@ -From 500389b43f88e74bf0444a4c7f02eec612419f11 Mon Sep 17 00:00:00 2001 +From fd36fc0ecc54c435937b2a09e3227d1a6d2d1e3d Mon Sep 17 00:00:00 2001 From: halfmaster1 Date: Tue, 18 May 2021 04:28:46 -0400 Subject: [PATCH] Make critical hits configurable @@ -32,5 +32,5 @@ index ca028d04..8cdcaf3a 100644 + } -- -2.39.2 +2.50.0 diff --git a/patches/server/0220-Optimize-networking-by-using-IP_TOS.patch b/patches/server/0218-Optimize-networking-by-using-IP_TOS.patch similarity index 93% rename from patches/server/0220-Optimize-networking-by-using-IP_TOS.patch rename to patches/server/0218-Optimize-networking-by-using-IP_TOS.patch index 68f275eec..0dca39604 100644 --- a/patches/server/0220-Optimize-networking-by-using-IP_TOS.patch +++ b/patches/server/0218-Optimize-networking-by-using-IP_TOS.patch @@ -1,4 +1,4 @@ -From 94b14fa428771a46eda1560dc4ea12a75094ca73 Mon Sep 17 00:00:00 2001 +From 0473d6807b44d8b79771a8d37c6098963bf2925f Mon Sep 17 00:00:00 2001 From: Heath Logan Campbell Date: Fri, 31 Jul 2020 12:43:00 +0200 Subject: [PATCH] Optimize networking by using IP_TOS @@ -18,5 +18,5 @@ index cc6f993b..052139d4 100644 ; } -- -2.39.2 +2.50.0 diff --git a/patches/server/0221-Add-Unix-domain-socket-support.patch b/patches/server/0219-Add-Unix-domain-socket-support.patch similarity index 99% rename from patches/server/0221-Add-Unix-domain-socket-support.patch rename to patches/server/0219-Add-Unix-domain-socket-support.patch index c6b09228a..feef9a80e 100644 --- a/patches/server/0221-Add-Unix-domain-socket-support.patch +++ b/patches/server/0219-Add-Unix-domain-socket-support.patch @@ -1,4 +1,4 @@ -From 6205973d8597aabd4c209c05fe24176c6ee63704 Mon Sep 17 00:00:00 2001 +From eed0a552fb9b2d79fbeb48328ae69c89b556a8fd Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 11 May 2021 17:39:22 -0400 Subject: [PATCH] Add Unix domain socket support @@ -216,5 +216,5 @@ index 052139d4..abdfedf6 100644 } -- -2.39.2 +2.50.0 diff --git a/patches/server/0222-Fix-east-west-cannoning.patch b/patches/server/0220-Fix-east-west-cannoning.patch similarity index 97% rename from patches/server/0222-Fix-east-west-cannoning.patch rename to patches/server/0220-Fix-east-west-cannoning.patch index 03b9c0db7..626282995 100644 --- a/patches/server/0222-Fix-east-west-cannoning.patch +++ b/patches/server/0220-Fix-east-west-cannoning.patch @@ -1,4 +1,4 @@ -From 9e08031e6d1ffab0b44dd8d3d8d24e164dbde8f5 Mon Sep 17 00:00:00 2001 +From fa4c43d1f83aae486ed04bb33734bfba83541a64 Mon Sep 17 00:00:00 2001 From: AmbrosL Date: Sat, 10 Mar 2018 02:33:28 +0100 Subject: [PATCH] Fix east/west cannoning @@ -62,5 +62,5 @@ index 0d95a296..2790207d 100644 double d10 = d0; double d11 = d1; -- -2.39.2 +2.50.0 diff --git a/patches/server/0223-Remove-hacky-stackable-buckets-code.patch b/patches/server/0221-Remove-hacky-stackable-buckets-code.patch similarity index 97% rename from patches/server/0223-Remove-hacky-stackable-buckets-code.patch rename to patches/server/0221-Remove-hacky-stackable-buckets-code.patch index 1548303c9..b63b31054 100644 --- a/patches/server/0223-Remove-hacky-stackable-buckets-code.patch +++ b/patches/server/0221-Remove-hacky-stackable-buckets-code.patch @@ -1,4 +1,4 @@ -From 3d38a1e462bfcc4a009ace1a8d349f719f9dddce Mon Sep 17 00:00:00 2001 +From b10c6741b5d697c3136b8f9f06ff2d0a39cbc33c Mon Sep 17 00:00:00 2001 From: hpfxd Date: Wed, 27 Oct 2021 20:46:41 -0400 Subject: [PATCH] Remove hacky stackable buckets code @@ -65,5 +65,5 @@ index 8cdcaf3a..065dcdf6 100644 public static boolean warnForExcessiveVelocity; -- -2.43.0 +2.50.0 diff --git a/patches/server/0224-Make-dimension-field-non-final.patch b/patches/server/0222-Make-dimension-field-non-final.patch similarity index 93% rename from patches/server/0224-Make-dimension-field-non-final.patch rename to patches/server/0222-Make-dimension-field-non-final.patch index e835cae70..af30c51b9 100644 --- a/patches/server/0224-Make-dimension-field-non-final.patch +++ b/patches/server/0222-Make-dimension-field-non-final.patch @@ -1,4 +1,4 @@ -From d6d18e96f0707b8036baa9a4b6fa6d7518bcd116 Mon Sep 17 00:00:00 2001 +From 6c66a4688988518aa4cb3970dbbf9366fa4fd949 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Sun, 31 Dec 2023 22:03:05 -0800 Subject: [PATCH] Make dimension field non-final @@ -18,5 +18,5 @@ index 9a2508c8..e536ae29 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, WorldData worlddata, int i, MethodProfiler methodprofiler, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { -- -2.43.0 +2.50.0 diff --git a/patches/server/0223-Update-several-build-plugins.patch b/patches/server/0223-Update-several-build-plugins.patch new file mode 100644 index 000000000..540492a60 --- /dev/null +++ b/patches/server/0223-Update-several-build-plugins.patch @@ -0,0 +1,55 @@ +From f19aadcf0744ceeb7df3f7743e27c109123f04f2 Mon Sep 17 00:00:00 2001 +From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> +Date: Tue, 22 Aug 2023 10:11:12 -0700 +Subject: [PATCH] Update several build plugins + + +diff --git a/pom.xml b/pom.xml +index 4aff3f3d..4f756286 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -120,7 +120,7 @@ + + net.md-5 + scriptus +- 0.4.1 ++ 0.5.0 + + + ex-sport +@@ -175,7 +175,7 @@ + + org.apache.maven.plugins + maven-jar-plugin +- 2.5 ++ 3.3.0 + + true + +@@ -215,7 +215,7 @@ + + org.apache.maven.plugins + maven-shade-plugin +- 3.2.4 ++ 3.5.0 + + + package +@@ -287,12 +287,12 @@ + + org.apache.maven.plugins + maven-compiler-plugin +- 3.1 ++ 3.11.0 + + + org.apache.maven.plugins + maven-surefire-plugin +- 2.18 ++ 3.1.2 + + ${basedir}/target/test-server + +-- +2.50.0 + diff --git a/patches/server/0226-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch b/patches/server/0224-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch similarity index 94% rename from patches/server/0226-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch rename to patches/server/0224-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch index 54db1cf1b..5d3609e17 100644 --- a/patches/server/0226-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch +++ b/patches/server/0224-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch @@ -1,4 +1,4 @@ -From e0c046f68018df323312eecb0a711587eb0bb029 Mon Sep 17 00:00:00 2001 +From 504fc94bf00275e51b03aa0c5ede95fb5edc8291 Mon Sep 17 00:00:00 2001 From: Christopher White <18whitechristop@gmail.com> Date: Sat, 20 Jul 2024 11:28:20 -0700 Subject: [PATCH] Readd NPE prevention for BlockDispenseEntityEvent @@ -22,5 +22,5 @@ index 9577483d..5c5ceed7 100644 BlockDispenseEntityEvent event = new BlockDispenseEntityEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1, d2), entity.getBukkitEntity()); if (!BlockDispenser.eventFired) { -- -2.45.2 +2.50.0 diff --git a/patches/server/0225-Update-several-build-plugins.patch b/patches/server/0225-Update-several-build-plugins.patch deleted file mode 100644 index a89b125f9..000000000 --- a/patches/server/0225-Update-several-build-plugins.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 1726ca7e38b99bf0a47dfaf3a4f14ec42aef4c04 Mon Sep 17 00:00:00 2001 -From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> -Date: Tue, 22 Aug 2023 10:11:12 -0700 -Subject: [PATCH] Update several build plugins - - -diff --git a/pom.xml b/pom.xml -index 6959c62a..41d4e4c7 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -117,65 +117,65 @@ - - install - -- -- net.md-5 -- scriptus -- 0.4.1 -- -- -- ex-sport -- -- git-SportPaper-%s -- ../ -- sportpaper.desc -- -- initialize -- -- describe -- -- -- -- ex-paper -- -- -P.%s -- ../base/Paper/PaperSpigot-Server -- paper.desc -- -- initialize -- -- describe -- -- -- -- ex-spigot -- -- -SP.%s -- ../base/Paper/Spigot-Server -- spigot.desc -- -- initialize -- -- describe -- -- -- -- ex-craftbukkit -- -- -CB.%s -- ../base/Paper/CraftBukkit -- craftbukkit.desc -- -- initialize -- -- describe -- -- -- -- -+ -+ net.md-5 -+ scriptus -+ 0.5.0 -+ -+ -+ ex-sport -+ -+ git-SportPaper-%s -+ ../ -+ sportpaper.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ ex-paper -+ -+ -P.%s -+ ../base/Paper/PaperSpigot-Server -+ paper.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ ex-spigot -+ -+ -SP.%s -+ ../base/Paper/Spigot-Server -+ spigot.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ ex-craftbukkit -+ -+ -CB.%s -+ ../base/Paper/CraftBukkit -+ craftbukkit.desc -+ -+ initialize -+ -+ describe -+ -+ -+ -+ - - org.apache.maven.plugins - maven-jar-plugin -- 2.5 -+ 3.3.0 - - true - -@@ -214,7 +214,7 @@ - - org.apache.maven.plugins - maven-shade-plugin -- 2.3 -+ 3.5.0 - - - package -@@ -259,7 +259,7 @@ - - net.md-5 - specialsource-maven-plugin -- 1.2.1 -+ 1.2.3 - - - package -@@ -276,12 +276,12 @@ - - org.apache.maven.plugins - maven-compiler-plugin -- 3.1 -+ 3.11.0 - - - org.apache.maven.plugins - maven-surefire-plugin -- 2.18 -+ 3.1.2 - - ${basedir}/target/test-server - --- -2.41.0 -