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

Rebuild our patches

This commit is contained in:
Zach Brown 2014-12-03 18:15:12 -06:00
parent 2a30a76ac5
commit 1d8cdd7bf5
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0024-Player-affects-spawning-API.patch
View File

@ -1,4 +1,4 @@
From 447080b025482480d29ced70cbf30bc18b8fbc4b Mon Sep 17 00:00:00 2001 From 08432ad3b0e4017a60ee44bb35cca598bc41e60e Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 28 Nov 2014 03:31:21 -0600 Date: Fri, 28 Nov 2014 03:31:21 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
@ -67,7 +67,7 @@ index 43954b3..932a572 100644
biomemeta = worldserver.a(enumcreaturetype, blockposition2); biomemeta = worldserver.a(enumcreaturetype, blockposition2);
if (biomemeta == null) { if (biomemeta == null) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4af7973..899e4b8 100644 index 0b13b28..852415b 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -2,14 +2,13 @@ package net.minecraft.server; @@ -2,14 +2,13 @@ package net.minecraft.server;
@ -94,7 +94,7 @@ index 4af7973..899e4b8 100644
import org.bukkit.craftbukkit.SpigotTimings; // Spigot import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
@@ -2767,6 +2765,50 @@ public abstract class World implements IBlockAccess { @@ -2773,6 +2771,50 @@ public abstract class World implements IBlockAccess {
return false; return false;
} }

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

@ -1,4 +1,4 @@
From f80b11f9bd044053f769a6091f5ed452f183586d Mon Sep 17 00:00:00 2001 From a1002560bc6eec5a3442c42ecdbc4073a19d9465 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Tue, 19 Aug 2014 14:21:37 -0500 Date: Tue, 19 Aug 2014 14:21:37 -0500
Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0c02747..246d042 100644 index cbea48e..e588241 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
@@ -1048,7 +1048,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -1044,7 +1044,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
} }
public String getServerModName() { public String getServerModName() {

12
Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From dfa34ba2aaf9c53152a181b2829f4c793c09b025 Mon Sep 17 00:00:00 2001 From a136b73aec98890a24457940f0f7dc79ce69c01d Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Fri, 28 Nov 2014 12:48:26 -0600 Date: Fri, 28 Nov 2014 12:48:26 -0600
Subject: [PATCH] Further improve server tick loop 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 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 246d042..21df638 100644 index e588241..e9f3458 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
@@ -113,17 +113,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -113,17 +113,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -34,7 +34,7 @@ index 246d042..21df638 100644
public MinecraftServer(OptionSet options, Proxy proxy, File file1) { public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
@@ -486,12 +480,53 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -482,12 +476,53 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.isRunning = false; this.isRunning = false;
} }
@ -93,7 +93,7 @@ index 246d042..21df638 100644
public void run() { public void run() {
try { try {
@@ -504,26 +539,43 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -500,26 +535,43 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.a(this.r); this.a(this.r);
// Spigot start // Spigot start
@ -150,10 +150,10 @@ index 246d042..21df638 100644
lastTick = curTime; lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1693627..160d665 100644 index b677519..612161e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1686,6 +1686,17 @@ public final class CraftServer implements Server { @@ -1684,6 +1684,17 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot() private final Spigot spigot = new Spigot()
{ {

8
Spigot-Server-Patches/0037-Improve-autosave-mechanism.patch
View File

@ -1,4 +1,4 @@
From 9307372b2c5d53c55cc41b0ecd4397f381a1c802 Mon Sep 17 00:00:00 2001 From 3a8b7719afd3d7a3301e1ef828dc15fdbff40023 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 13:47:24 -0600 Date: Fri, 28 Nov 2014 13:47:24 -0600
Subject: [PATCH] Improve autosave mechanism Subject: [PATCH] Improve autosave mechanism
@ -19,10 +19,10 @@ index 949fa96..881e963 100644
} }
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 21df638..f51a50d 100644 index e9f3458..e3c5754 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
@@ -698,9 +698,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -694,9 +694,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
// Spigot Start // Spigot Start
// We replace this with saving each individual world as this.saveChunks(...) is broken, // We replace this with saving each individual world as this.saveChunks(...) is broken,
// and causes the main thread to sleep for random amounts of time depending on chunk activity // and causes the main thread to sleep for random amounts of time depending on chunk activity
@ -35,7 +35,7 @@ index 21df638..f51a50d 100644
server.playerCommandState = false; server.playerCommandState = false;
// this.saveChunks(true); // this.saveChunks(true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d5ea292..9bff318 100644 index 62f6328..91e6aed 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -688,12 +688,18 @@ public class CraftWorld implements World { @@ -688,12 +688,18 @@ public class CraftWorld implements World {