Skip to content

Update Paper submodule #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cswhite2000 merged 1 commit into from
Jul 4, 2025
Merged

Update Paper submodule #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion base/Paper
Open in desktop
Submodule Paper updated 13 files
+1 −1 CraftBukkit
+1 −1 Paperclip
+7 −7 Spigot-API-Patches/0001-POM-changes.patch
+37 −37 Spigot-API-Patches/0014-Timings-v2.patch
+54 −0 Spigot-API-Patches/0022-Fix-ServerListPingEvent-flagging-as-Async.patch
+12 −12 Spigot-Server-Patches/0001-POM-Changes.patch
+64 −64 Spigot-Server-Patches/0003-mc-dev-imports.patch
+4 −4 Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch
+8 −8 Spigot-Server-Patches/0063-Optimize-Spigot-s-Anti-X-Ray.patch
+27 −28 Spigot-Server-Patches/0079-Timings-v2.patch
+102 −0 Spigot-Server-Patches/0102-update-log4j.patch
+5 −3 paperclip.sh
+2 −2 pom.xml
135 changes: 62 additions & 73 deletions patches/server/0002-This-is-SportPaper.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From bec48f109af4a7e0e4dc562fcc44857b68a2f0d6 Mon Sep 17 00:00:00 2001
From b8791ddf31e3c636367c29fd8f078e5fdcbb48e5 Mon Sep 17 00:00:00 2001
From: Austin Mayes <austin@avicus.net>
Date: Mon, 16 Oct 2017 11:45:28 -0500
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 @@
Expand Down Expand Up @@ -48,20 +48,10 @@ index 6aaba5027..5d6a6dba4 100644
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -100,7 +98,7 @@
<!-- PaperSpigot - Repo for gitdescribe -->
<pluginRepository>
<id>destroystokyo</id>
- <url>https://ci.destroystokyo.com/plugin/repository/everything/</url>
+ <url>https://papermc.io/repo/repository/maven-public/</url>
</pluginRepository>
</pluginRepositories>

@@ -108,23 +106,61 @@
<build>
@@ -115,22 +113,60 @@
<defaultGoal>install</defaultGoal>
<plugins>
- <plugin>
<plugin>
- <groupId>com.lukegb.mojo</groupId>
- <artifactId>gitdescribe-maven-plugin</artifactId>
- <version>1.3</version>
Expand All @@ -78,65 +68,64 @@ index 6aaba5027..5d6a6dba4 100644
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>net.md-5</groupId>
+ <artifactId>scriptus</artifactId>
+ <version>0.4.1</version>
+ <executions>
+ <execution>
+ <id>ex-sport</id>
+ <configuration>
+ <format>git-SportPaper-%s</format>
+ <scmDirectory>../</scmDirectory>
+ <descriptionProperty>sportpaper.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>ex-paper</id>
+ <configuration>
+ <format>-P.%s</format>
+ <scmDirectory>../base/Paper/PaperSpigot-Server</scmDirectory>
+ <descriptionProperty>paper.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>ex-spigot</id>
+ <configuration>
+ <format>-SP.%s</format>
+ <scmDirectory>../base/Paper/Spigot-Server</scmDirectory>
+ <descriptionProperty>spigot.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>ex-craftbukkit</id>
+ <configuration>
+ <format>-CB.%s</format>
+ <scmDirectory>../base/Paper/CraftBukkit</scmDirectory>
+ <descriptionProperty>craftbukkit.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <groupId>net.md-5</groupId>
+ <artifactId>scriptus</artifactId>
+ <version>0.4.1</version>
+ <executions>
+ <execution>
+ <id>ex-sport</id>
+ <configuration>
+ <format>git-SportPaper-%s</format>
+ <scmDirectory>../</scmDirectory>
+ <descriptionProperty>sportpaper.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>ex-paper</id>
+ <configuration>
+ <format>-P.%s</format>
+ <scmDirectory>../base/Paper/PaperSpigot-Server</scmDirectory>
+ <descriptionProperty>paper.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>ex-spigot</id>
+ <configuration>
+ <format>-SP.%s</format>
+ <scmDirectory>../base/Paper/Spigot-Server</scmDirectory>
+ <descriptionProperty>spigot.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>ex-craftbukkit</id>
+ <configuration>
+ <format>-CB.%s</format>
+ <scmDirectory>../base/Paper/CraftBukkit</scmDirectory>
+ <descriptionProperty>craftbukkit.desc</descriptionProperty>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -135,7 +171,7 @@
@@ -141,7 +177,7 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title>
Expand All @@ -146,7 +135,7 @@ index 6aaba5027..5d6a6dba4 100644
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-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
Expand All @@ -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 {
Expand All @@ -172,5 +161,5 @@ index 3a4b14246..36bb612a9 100644

if (stream != null) {
--
2.30.2
2.50.0

8 changes: 4 additions & 4 deletions patches/server/0194-Update-MySQL-Connector.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 8f44896ae94500d9533a5b8bf884e5e505fc475c Mon Sep 17 00:00:00 2001
From ef4ce39e89a038ec0d39e8f238dfc6d333d25a33 Mon Sep 17 00:00:00 2001
From: VytskaLT <VytskaLT@protonmail.com>
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 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Expand All @@ -18,5 +18,5 @@ index 6a9d969e..404eb178 100644
<scope>compile</scope>
</dependency>
--
2.25.1
2.50.0

26 changes: 0 additions & 26 deletions patches/server/0208-Disable-log4j-message-formatting.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...hes/server/0210-Fix-chunk-unloading.patch → ...hes/server/0208-Fix-chunk-unloading.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 827e396174f52fe04ebeed7ef0a930ad653b5805 Mon Sep 17 00:00:00 2001
From c3f8a64344bff6a1cc78d0a9ad170a3254f53127 Mon Sep 17 00:00:00 2001
From: applenick <applenick@users.noreply.github.com>
Date: Wed, 29 Dec 2021 16:09:42 -0800
Subject: [PATCH] Fix chunk unloading
Expand Down Expand Up @@ -27,5 +27,5 @@ index 550d824e..812686d5 100644
public IChunkProvider chunkProvider;
private IChunkLoader chunkLoader;
--
2.32.0 (Apple Git-132)
2.50.0

4 changes: 2 additions & 2 deletions ...dd-events-for-water-source-creation.patch → ...dd-events-for-water-source-creation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bc723759409412b6e0964f958f8c5d5ba681bb10 Mon Sep 17 00:00:00 2001
From 55881638d6be1b199750687e0eae2f060723d195 Mon Sep 17 00:00:00 2001
From: OhPointFive <ohpointfive@gmail.com>
Date: Thu, 7 Jul 2022 00:33:31 -0400
Subject: [PATCH] Add events for water source creation
Expand Down Expand Up @@ -80,5 +80,5 @@ index be8bb5be..cc4d7319 100644
world.setAir(blockposition);
} else {
--
2.39.1
2.50.0

Loading