Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Update CB/S

Browse Source
This commit is contained in:
Shane Freeder 2017-10-07 09:57:38 +01:00
parent 3a9f17bc4b
commit d649f90be0
7 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Add-PlayerJumpEvent.patch
View File

@ -17,7 +17,7 @@ index e9f48ecad..00fe92fa8 100644
super.cu();
this.b(StatisticList.w);
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 760cb16c3..37a59de54 100644
index e529ea60b..36af72387 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.EquipmentSlot;

20
Spigot-Server-Patches/Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch
View File

@ -1,20 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Riley Park <rileysebastianpark@gmail.com>
Date: Thu, 21 Sep 2017 07:00:43 -0700
Subject: [PATCH] Avoid NPE in AdvancementDataWorld thanks to Spigot being dumb
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 9ce3e1365..712fc1f9b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ public class SpigotConfig
}
public static boolean disableAdvancementSaving;
- public static List<String> disabledAdvancements;
+ public static List<String> disabledAdvancements = java.util.Collections.emptyList(); // Paper - avoid NPE in AdvancementDataWorld
private static void disabledAdvancements() {
disableAdvancementSaving = getBoolean("advancements.disable-saving", false);
disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"}));
--

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

@ -28,7 +28,7 @@ index aff997468..dfb006aa0 100644
<!-- Paper - Add additional Log4J dependencies -->
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 712fc1f9b..b5bfb15fa 100644
index 9ce3e1365..cc1f3ac96 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ public class SpigotConfig

2
Spigot-Server-Patches/Include-Log4J2-SLF4J-implementation.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Include Log4J2 SLF4J implementation
diff --git a/pom.xml b/pom.xml
index fa726851b..647b2c619 100644
index dfb006aa0..07e780b6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@

2
Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async.patch
View File

@ -12,7 +12,7 @@ disconnection to the main thread, but leave the actual processing of the packet
off the main thread.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d8f9a093b..f60f21fd2 100644
index 36af72387..14815ed4d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 362ed329f0c764cff343683f46c18c374092155d
Subproject commit f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb

2
work/Spigot

@ -1 +1 @@
Subproject commit 775423189fea374bf4f1d0391c4cf242e741185f
Subproject commit 93e20b3652e42c34d30c306592aaec7fd3a41504