SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

Update upstream B/CB/S

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zach Brown 2016-07-15 17:36:53 -05:00
Ursprung aff7563c30
Commit 719164b4ce
6 geänderte Dateien mit 8 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
Spigot-Server-Patches/Add-exception-reporting-event.patch
Datei anzeigen

@ -247,8 +247,8 @@ diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -0,0 +0,0 @@ import java.util.List;
import java.util.Random;
@@ -0,0 +0,0 @@ import java.util.Random;
import java.util.Set;
// CraftBukkit start
+import com.destroystokyo.paper.exception.ServerInternalException;

1
Spigot-Server-Patches/Lighting-Queue.patch
Datei anzeigen

@ -3,6 +3,7 @@ From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue
This provides option to queue lighting updates to ensure they do not cause the server lag
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644

4
Spigot-Server-Patches/Timings-v2.patch
Datei anzeigen

@ -468,9 +468,9 @@ diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
import org.bukkit.Bukkit;
@@ -0,0 +0,0 @@ import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.Main;
// CraftBukkit end
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
+import co.aikar.timings.MinecraftTimings; // Paper

2
work/Bukkit

@ -1 +1 @@
Subproject commit 19b3d5ef4cd3cc4cef246dd9dba02199e19f5daf
Subproject commit e73ec6b833d245ce3c984d6da1cccb22fbe9f3e5

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 301db84d3d85f5218f3ec590224071c04140bbe2
Subproject commit 7f9fbe54baf0e73dc6a9a1ff58d67f82881507a4

2
work/Spigot

@ -1 +1 @@
Subproject commit 9797151286c045686e3d09389353431efcc6034a
Subproject commit 078e2f8b3c4d46cfc88cef5a0818891aeca78a2e