SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply fixups

Browse Source
This commit is contained in:
Mariell Hoversholm
2021-03-16 17:37:33 +01:00
parent dc29362b55
commit 9214bd49ba
5 changed files with 7 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Spigot-Server-Patches/0547-Brand-support.patch → Spigot-Server-Patches/0548-Brand-support.patch
View File

6
Spigot-Server-Patches/Improved-Watchdog-Support.patch
View File

@@ -442,9 +442,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent"); + tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent");
+ tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent"); + tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent");
+ // Minecraft, seen during saving + // Minecraft, seen during saving
+ tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void"); + tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void");
+ tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener"); + tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener");
+ tryPreloadClass("net.minecraft.server.ExceptionSuppressor"); + tryPreloadClass("net.minecraft.util.ExceptionSuppressor");
+ // Paper end + // Paper end
+ } + }
+ } + }

5
Spigot-Server-Patches/POM-Changes.patch
View File

@@ -59,8 +59,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ <dependency> + <dependency>
+ <groupId>io.papermc</groupId> + <groupId>io.papermc</groupId>
<artifactId>minecraft-server</artifactId> <artifactId>minecraft-server</artifactId>
<version>${minecraft.version}-SNAPSHOT</version> - <version>${minecraft.version}-SNAPSHOT</version>
+ <version>${minecraft.version}-R0.2-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency>
<dependency>
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<version>9.0</version> <version>9.0</version>
<scope>compile</scope> <scope>compile</scope>

23
Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch
View File

@@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Tue, 16 Mar 2021 16:56:35 +0100
Subject: [PATCH] fixup! Improved Watchdog Support
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -0,0 +0,0 @@ public class Main {
tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent");
tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent");
// Minecraft, seen during saving
- tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void");
- tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener");
- tryPreloadClass("net.minecraft.server.ExceptionSuppressor");
+ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void");
+ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener");
+ tryPreloadClass("net.minecraft.util.ExceptionSuppressor");
// Paper end
}
}

19
Spigot-Server-Patches/fixup-POM-Changes.patch
View File

@@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Tue, 16 Mar 2021 17:06:29 +0100
Subject: [PATCH] fixup! POM Changes
diff --git a/pom.xml b/pom.xml
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
<dependency>
<groupId>io.papermc</groupId>
<artifactId>minecraft-server</artifactId>
- <version>${minecraft.version}-SNAPSHOT</version>
+ <version>${minecraft.version}-R0.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>