core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild patches for upstream changes

This commit is contained in:
Zach 2015-02-13 14:24:02 -06:00
parent 450a0ff892
commit f856100e66
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0024-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch
View File

@ -1,4 +1,4 @@
From 61f16c7a18f6f4437a5e0755fbb99554d11ffcc4 Mon Sep 17 00:00:00 2001
From c353c92f3435e1a7ae166172936b75d0732a414a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 19 Aug 2014 14:21:37 -0500
Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
@ -6,10 +6,10 @@ Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 90072fd..e558b31 100644
index 7e91511..fbc2e61 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1049,7 +1049,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -1060,7 +1060,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
public String getServerModName() {
@ -19,5 +19,5 @@ index 90072fd..e558b31 100644
public CrashReport b(CrashReport crashreport) {
--
1.9.5.msysgit.0
2.3.0

10
Spigot-Server-Patches/0032-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From 4959d644d2d14fb12d4c574b24a6b1492d280450 Mon Sep 17 00:00:00 2001
From 43723d4317f9fc2ed6bdce8ef090b9847e236bbf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 12:48:26 -0600
Subject: [PATCH] Further improve server tick loop
@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 86b8cb2..3592150 100644
index fbc2e61..43567fc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -113,17 +113,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -34,7 +34,7 @@ index 86b8cb2..3592150 100644
public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
@@ -482,12 +476,53 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -493,12 +487,53 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.isRunning = false;
}
@ -93,7 +93,7 @@ index 86b8cb2..3592150 100644
public void run() {
try {
@@ -500,26 +535,43 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -511,26 +546,43 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.a(this.r);
// Spigot start
@ -212,5 +212,5 @@ index be2e31d..21fd7ef 100644
return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
+ ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
--
1.9.5.msysgit.0
2.3.0