Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-30 20:21:41 +01:00
Code Issues Projects Releases Wiki Activity

Update S

Browse Source 
Also drop a few patches which are no longer needed/already merged in.
This commit is contained in:
Shane Freeder 2018-07-23 18:21:07 +01:00
parent fea7cd7e3c
commit ceedd8c4f1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch
View File

@ -28,7 +28,7 @@ index a93ed45df9..bb32cb749d 100644
<!-- Paper - Add additional Log4J dependencies --> <!-- Paper - Add additional Log4J dependencies -->
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 676780b619..5a873fe9d7 100644 index ffbb1e894a..7f3543970f 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java --- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ public class SpigotConfig @@ -0,0 +0,0 @@ public class SpigotConfig

4
Spigot-Server-Patches/Implement-extended-PaperServerListPingEvent.patch
View File

@ -177,7 +177,7 @@ index 0000000000..350410527b
+ +
+} +}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cdcc375923..66b637326a 100644 index 8e72220f37..90b1871196 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -251,7 +251,7 @@ index d7e1ecc031..f20cddc41c 100644
this.c = agameprofile; this.c = agameprofile;
} }
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 5a873fe9d7..42bd3b6edd 100644 index 7f3543970f..6cc48258dc 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java --- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ public class SpigotConfig @@ -0,0 +0,0 @@ public class SpigotConfig

2
work/Spigot

@ -1 +1 @@
Subproject commit 5eb39219b1987510730e082ef6c14470b11bcc5b Subproject commit a85f7ec0de6263efed322bb8527c6360ea1109a7