CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pop tick loop patch to top

Browse Source
This commit is contained in:
md_5 2014-01-22 19:19:39 +11:00
parent 2367cf0a3d
commit 29c6c774dd
87 changed files with 173 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CraftBukkit-Patches/0015-Improved-Timings-System.patch → CraftBukkit-Patches/0014-Improved-Timings-System.patch
View File

@ -1,4 +1,4 @@
From 98e68a83a33a2f4152c4afe7eeae5450739829bc Mon Sep 17 00:00:00 2001
From 3d0e03d41e52731cea8e9ea8b6f1eca63a4b07ba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@ -64,7 +64,7 @@ index dc0abc5..3d6aeff 100644
protected String H() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7dabffb..59f6831 100644
index 6a01982..94fabdb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
@ -83,19 +83,19 @@ index 7dabffb..59f6831 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -449,8 +449,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
lastTick = curTime;
MinecraftServer.currentTick++;
@@ -458,8 +458,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
}
+ SpigotTimings.serverTickTimer.startTiming();
this.t();
Thread.sleep(1L);
this.N = true;
+ SpigotTimings.serverTickTimer.stopTiming();
+ org.spigotmc.CustomTimingsHandler.tick();
}
// Spigot end
} else {
@@ -575,6 +578,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a((CrashReport) null);
@@ -583,6 +586,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void u() {
this.methodProfiler.a("levels");
@ -103,7 +103,7 @@ index 7dabffb..59f6831 100644
// CraftBukkit start
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
@@ -583,7 +587,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -591,7 +595,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
processQueue.remove().run();
}
@ -114,7 +114,7 @@ index 7dabffb..59f6831 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
@@ -635,7 +642,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -643,7 +650,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -124,7 +124,7 @@ index 7dabffb..59f6831 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -644,14 +653,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -652,14 +661,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
this.methodProfiler.c("connection");

2
CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch → CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View File

@ -1,4 +1,4 @@
From b8be62f188026035f7ec74efda2cd18f69c9be63 Mon Sep 17 00:00:00 2001
From 443ccbbd5642797eb7374259c740e6ba2c417001 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance

2
CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch → CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
View File

@ -1,4 +1,4 @@
From a40b31d7074454fdd9e176af05cc760906b7b264 Mon Sep 17 00:00:00 2001
From 1a7e92b8f083d819750ddabb094a5f6d16cdd77a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities

2
CraftBukkit-Patches/0018-Entity-Activation-Range.patch → CraftBukkit-Patches/0017-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From 825f177a357447c0542949b349e839fee21c50ce Mon Sep 17 00:00:00 2001
From d9baaf527c0e4b45fdd7e79047c75d0be14dc42e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range

8
CraftBukkit-Patches/0019-Metrics.patch → CraftBukkit-Patches/0018-Metrics.patch
View File

@ -1,4 +1,4 @@
From 0c0ad717ccf5b2eadcd450fcd8b88011bec309a3 Mon Sep 17 00:00:00 2001
From def224a4cb38f7e7d7bdfd97a09b0c3c66aaafca Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics
@ -657,10 +657,10 @@ index 0000000..f1690a2
+}
\ No newline at end of file
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 1b0e1bf..0043690 100644
index 3dfe4ed..9aaa09a 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -36,6 +36,7 @@ public class SpigotConfig
@@ -35,6 +35,7 @@ public class SpigotConfig
static int version;
static Map<String, Command> commands;
/*========================================================================*/
@ -668,7 +668,7 @@ index 1b0e1bf..0043690 100644
public static void init()
{
@@ -56,6 +57,18 @@ public class SpigotConfig
@@ -55,6 +56,18 @@ public class SpigotConfig
{
MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
}

2
CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch → CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch
View File

@ -1,4 +1,4 @@
From c530ebb6e1c7bd61e041cfd3ecc5f40382603bcb Mon Sep 17 00:00:00 2001
From a1d3c98851e0b823ed74e25dd5b587bdbd5f36eb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent

2
CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch → CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch
View File

@ -1,4 +1,4 @@
From 02758d5711800b769860b2c9a759216b93e99ed3 Mon Sep 17 00:00:00 2001
From 91fc1d0f8ae1695094f95e8a3bfc4c3975623bc5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities

2
CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch → CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch
View File

@ -1,4 +1,4 @@
From 88c06061a50cc78e4ae257cbf9c720fc574c639d Mon Sep 17 00:00:00 2001
From b39026df75e6dfd9e8f3110088c438babad87931 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 18 Mar 2013 20:01:44 +1100
Subject: [PATCH] Prevent NPE in CraftSign

2
CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch → CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch
View File

@ -1,4 +1,4 @@
From 9b5ea03810a7d9eb28ced82c271b59988a7ac21b Mon Sep 17 00:00:00 2001
From c2abeafd78bd06afce4fe95d8476572e6b2041d3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges

2
CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch → CraftBukkit-Patches/0023-Limit-Custom-Map-Rendering.patch
View File

@ -1,4 +1,4 @@
From aa591c34dadb378e4318e196c9db52d9bfaa077a Mon Sep 17 00:00:00 2001
From 47d180eac9a5d06287a2cad611a6c586a2a707df Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 19:08:41 +1100
Subject: [PATCH] Limit Custom Map Rendering

2
CraftBukkit-Patches/0025-Enable-Improved-Ping-Sending.patch → CraftBukkit-Patches/0024-Enable-Improved-Ping-Sending.patch
View File

@ -1,4 +1,4 @@
From 508dce05202b02816679fb912f33df0a93a9ae41 Mon Sep 17 00:00:00 2001
From d734e106f3f2185a88917e49ac96e4babe7ac606 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved Ping Sending

2
CraftBukkit-Patches/0026-Thread-Naming-and-Tweaks.patch → CraftBukkit-Patches/0025-Thread-Naming-and-Tweaks.patch
View File

@ -1,4 +1,4 @@
From bef5189452713a09993d5ab2bdafc97964e51e8e Mon Sep 17 00:00:00 2001
From a62448bf0ffb755f40a58adc1f6263d9d105b524 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:50:27 +1000
Subject: [PATCH] Thread Naming and Tweaks

2
CraftBukkit-Patches/0027-Close-Unloaded-Save-Files.patch → CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
View File

@ -1,4 +1,4 @@
From 72da0a33d19eac6c86adf79d69428a19cb6e17a3 Mon Sep 17 00:00:00 2001
From 35e0f88aaf851cc197387b047c01a3c652ce8699 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files

2
CraftBukkit-Patches/0028-Remove-o-Option.patch → CraftBukkit-Patches/0027-Remove-o-Option.patch
View File

@ -1,4 +1,4 @@
From 3084bb2817b2f31d495fa8f8a1b47551e6b32ebf Mon Sep 17 00:00:00 2001
From f06705bc41d4f4406c29bbed39ce22439ded5b7c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 19 May 2013 18:29:48 +1000
Subject: [PATCH] Remove -o Option

2
CraftBukkit-Patches/0029-Recipe-Deconstruction.patch → CraftBukkit-Patches/0028-Recipe-Deconstruction.patch
View File

@ -1,4 +1,4 @@
From 820bfcae3d6b21b1e8b0f1298885d59838e072fe Mon Sep 17 00:00:00 2001
From 1a282beb73506a12021b477ce5b9edf58f410474 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 1 Jun 2013 16:34:38 +1000
Subject: [PATCH] Recipe Deconstruction

2
CraftBukkit-Patches/0030-Implement-Arrow-API.patch → CraftBukkit-Patches/0029-Implement-Arrow-API.patch
View File

@ -1,4 +1,4 @@
From 28a28bb1183276cc77eacc0c17ef5988dab17b0d Mon Sep 17 00:00:00 2001
From c2c024a52073c2ad367c4a5428604c88432a4404 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API

2
CraftBukkit-Patches/0031-Hopper-Cooldowns.patch → CraftBukkit-Patches/0030-Hopper-Cooldowns.patch
View File

@ -1,4 +1,4 @@
From cde7f232212d25c0082bf180b7550ad7408e19a3 Mon Sep 17 00:00:00 2001
From 802f26d4ab9671c6253a1c346671a86281bb020d Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Cooldowns

2
CraftBukkit-Patches/0032-Prevent-Shutdown-Hang.patch → CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
View File

@ -1,4 +1,4 @@
From 64b5d80043764c4018da50f724e6a4db78828c03 Mon Sep 17 00:00:00 2001
From 182aaa84bf197b9a61ec3a79033457788c4f1188 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang

2
CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch → CraftBukkit-Patches/0032-Implement-SpawnerSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From 851e8e213cfb8cc2fb0e9ceb2c1499cba7ac398e Mon Sep 17 00:00:00 2001
From 887954f469d99c0dd5f8b7c5bb71f0ba1216f820 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent.

2
CraftBukkit-Patches/0034-Firework-Meta-Crash-Fix.patch → CraftBukkit-Patches/0033-Firework-Meta-Crash-Fix.patch
View File

@ -1,4 +1,4 @@
From b239041862d977ea423040d0df74202effd4c5af Mon Sep 17 00:00:00 2001
From a323a8c99f24a6eb9e7be9fafed35d373384d557 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 15 Jun 2013 21:34:48 +1000
Subject: [PATCH] Firework Meta Crash Fix

2
CraftBukkit-Patches/0035-Do-Not-Search-for-Offline-Players.patch → CraftBukkit-Patches/0034-Do-Not-Search-for-Offline-Players.patch
View File

@ -1,4 +1,4 @@
From ba3c0beaf5b82f2233149ae220d6be4b12856a5d Mon Sep 17 00:00:00 2001
From 748c2f52c6590bca633e18a98674b3a684acfd0c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players

10
CraftBukkit-Patches/0036-Allow-Disabling-of-Command-Logging.patch → CraftBukkit-Patches/0035-Allow-Disabling-of-Command-Logging.patch
View File

@ -1,4 +1,4 @@
From 249f0877f660340f3afefe483a6c2c5f546ab721 Mon Sep 17 00:00:00 2001
From 0a8589407c0e09791756ec92ddc0d6cb81084a9a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
@ -23,12 +23,12 @@ index d0ea17a..31be464 100644
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
return;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 0043690..26d5845 100644
index 9aaa09a..4d15f8b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -136,4 +136,10 @@ public class SpigotConfig
{
commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
@@ -130,4 +130,10 @@ public class SpigotConfig
config.addDefault( path, def );
return config.getString( path, config.getString( path ) );
}
+
+ public static boolean logCommands;

6
CraftBukkit-Patches/0037-Allow-Disabling-of-Command-TabComplete.patch → CraftBukkit-Patches/0036-Allow-Disabling-of-Command-TabComplete.patch
View File

@ -1,4 +1,4 @@
From 8db8936f36c119edbf0ed957948978d6b4a8e4aa Mon Sep 17 00:00:00 2001
From a5df96e3cb33d275fa20fb9b1a515718e249e78f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
@ -23,10 +23,10 @@ index b60ca66..4f03183 100644
try {
completions = getCommandMap().tabComplete(player, message.substring(1));
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 26d5845..dd842c6 100644
index 4d15f8b..8764045 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -142,4 +142,10 @@ public class SpigotConfig
@@ -136,4 +136,10 @@ public class SpigotConfig
{
logCommands = getBoolean( "commands.log", true );
}

8
CraftBukkit-Patches/0038-Configurable-Messages.patch → CraftBukkit-Patches/0037-Configurable-Messages.patch
View File

@ -1,4 +1,4 @@
From eb8c380d237d918ed3cf4315a6b3246ac353521c Mon Sep 17 00:00:00 2001
From 4e5abe2fe18bee263c2fc08f7bde8f6ef49e0ee3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -62,7 +62,7 @@ index 4f03183..0ac8f52 100644
return false;
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index dd842c6..6d0a08e 100644
index 8764045..8b7c73e 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -12,6 +12,7 @@ import java.util.Map;
@ -72,8 +72,8 @@ index dd842c6..6d0a08e 100644
+import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
@@ -148,4 +149,28 @@ public class SpigotConfig
@@ -142,4 +143,28 @@ public class SpigotConfig
{
tabComplete = getBoolean( "commands.tab-complete", true );
}

2
CraftBukkit-Patches/0039-Allow-Disabling-of-Random-Lighting-Updates.patch → CraftBukkit-Patches/0038-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@ -1,4 +1,4 @@
From 36cb297c394d629e8be30555a40d919481919e6e Mon Sep 17 00:00:00 2001
From 28ebc911a44f4da8ade44040fc9a8b652c767259 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates

2
CraftBukkit-Patches/0040-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch → CraftBukkit-Patches/0039-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
View File

@ -1,4 +1,4 @@
From e77a472314397933ec067e409257e386c26be32c Mon Sep 17 00:00:00 2001
From 3dae5e1925743d9ebbb0594f53997193fd433561 Mon Sep 17 00:00:00 2001
From: Andre LeBlanc <andre@norcode.com>
Date: Sat, 6 Apr 2013 12:00:31 -0400
Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes

2
CraftBukkit-Patches/0041-Properly-Close-Inventories.patch → CraftBukkit-Patches/0040-Properly-Close-Inventories.patch
View File

@ -1,4 +1,4 @@
From 6dabb52490ee3e398dd05a60d5fb9579290babf8 Mon Sep 17 00:00:00 2001
From 531c8827e96bda948b68adfbd99bac2356acd6e1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories

2
CraftBukkit-Patches/0042-Disallow-Interaction-With-Self.patch → CraftBukkit-Patches/0041-Disallow-Interaction-With-Self.patch
View File

@ -1,4 +1,4 @@
From 69b265cf9b6035669c60bfe63e1852ea49bb5cde Mon Sep 17 00:00:00 2001
From 45a1459ce02062300b758f2053a689b87f074ac0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self

2
CraftBukkit-Patches/0043-Lower-Chunk-Compression.patch → CraftBukkit-Patches/0042-Lower-Chunk-Compression.patch
View File

@ -1,4 +1,4 @@
From 43faa281f12d753491d3e813982337d85065672e Mon Sep 17 00:00:00 2001
From 907223885134524c827404ec8db98e5d0fde28d1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:07:54 +1000
Subject: [PATCH] Lower Chunk Compression

2
CraftBukkit-Patches/0044-Entity-Mount-and-Dismount-Events.patch → CraftBukkit-Patches/0043-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,4 +1,4 @@
From 5b313403b3ffb70d26a12424cdda0c8e51daa6c7 Mon Sep 17 00:00:00 2001
From ff8ebc0965a86af74237fb0c55c32e6b2e55c7d2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events

2
CraftBukkit-Patches/0045-Prevent-Ghost-Players-Caused-by-Plugins.patch → CraftBukkit-Patches/0044-Prevent-Ghost-Players-Caused-by-Plugins.patch
View File

@ -1,4 +1,4 @@
From 66b224ee5c8e7c4101d150d0343eb4b4922b4216 Mon Sep 17 00:00:00 2001
From 9ce8641a0d9005a3c9df8267ca3bec62b804b01b Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins

2
CraftBukkit-Patches/0046-Entity-ticking-chunk-caching.patch → CraftBukkit-Patches/0045-Entity-ticking-chunk-caching.patch
View File

@ -1,4 +1,4 @@
From be6fe9effd62617726e175f8bfd2227a83c2a59a Mon Sep 17 00:00:00 2001
From 4702a15a24589d356c8672427ddd07713d060f11 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Tue, 16 Jul 2013 03:32:32 +0500
Subject: [PATCH] Entity ticking chunk caching

2
CraftBukkit-Patches/0047-Plug-World-Unload-Memory-Leak.patch → CraftBukkit-Patches/0046-Plug-World-Unload-Memory-Leak.patch
View File

@ -1,4 +1,4 @@
From 5b98e72c08dd604fb41226e0b46b2e5fc183b48e Mon Sep 17 00:00:00 2001
From 8be7e50e9473293a72fa651cd323d93342b49ac9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:02:59 +1000
Subject: [PATCH] Plug World Unload Memory Leak

2
CraftBukkit-Patches/0048-Player-Collision-API.patch → CraftBukkit-Patches/0047-Player-Collision-API.patch
View File

@ -1,4 +1,4 @@
From 89e3c3a7a4e8cc1e69644153bc8096741b54d29a Mon Sep 17 00:00:00 2001
From eb38a6812659dd0856232d86bd09699ee79f3298 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API

6
CraftBukkit-Patches/0049-Fully-Disable-Snooper-When-Not-Required.patch → CraftBukkit-Patches/0048-Fully-Disable-Snooper-When-Not-Required.patch
View File

@ -1,14 +1,14 @@
From 0783a86b0d7014214d1610a6e3372b143ba38909 Mon Sep 17 00:00:00 2001
From bbc36e46a3a0dd6cff639c505a75b973de93c8ed Mon Sep 17 00:00:00 2001
From: agentk20 <agentkid20@gmail.com>
Date: Sat, 3 Aug 2013 19:28:48 +1000
Subject: [PATCH] Fully Disable Snooper When Not Required
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 59f6831..0e0de44 100644
index 94fabdb..7b6e83c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -563,11 +563,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -571,11 +571,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.f[this.ticks % 100] = System.nanoTime() - i;
this.methodProfiler.b();
this.methodProfiler.a("snooper");

2
CraftBukkit-Patches/0050-Add-Getter-for-Entity-Invulnerability.patch → CraftBukkit-Patches/0049-Add-Getter-for-Entity-Invulnerability.patch
View File

@ -1,4 +1,4 @@
From e02558310e82bca892d4265957729c1b699429eb Mon Sep 17 00:00:00 2001
From b366c0e45babd58ac6166a557a519bb367eb900e Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sat, 3 Aug 2013 19:53:48 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability

2
CraftBukkit-Patches/0051-Guard-entity-list.patch → CraftBukkit-Patches/0050-Guard-entity-list.patch
View File

@ -1,4 +1,4 @@
From f0939f62fe3bf4860dc5380e3346ee5cb0dfe649 Mon Sep 17 00:00:00 2001
From e241a4fff80fdf576671bca124cb61fd53b28630 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Sat, 3 Aug 2013 21:42:00 +0500
Subject: [PATCH] Guard entity list

2
CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch → CraftBukkit-Patches/0051-Cap-Minimum-Player-Speed.patch
View File

@ -1,4 +1,4 @@
From cb4ca52b7b0ed594cdd756bfb5a92ac0ee09c8e8 Mon Sep 17 00:00:00 2001
From 24774bf49301649fabd823225cf86b7256429aa3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed

2
CraftBukkit-Patches/0053-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch → CraftBukkit-Patches/0052-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
View File

@ -1,4 +1,4 @@
From c40442d67561f047f72332d4006ad488bc64701a Mon Sep 17 00:00:00 2001
From e4d29a379dcd02ff709d16a3653384c073777c61 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 14 Sep 2013 10:16:38 +1000
Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent

2
CraftBukkit-Patches/0054-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch → CraftBukkit-Patches/0053-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
View File

@ -1,4 +1,4 @@
From 766dc7b92b54c2daede6c4ddfd50e4501293c9e6 Mon Sep 17 00:00:00 2001
From b4f4baa3a9363df73cb286e81e05a3fd2e5892d2 Mon Sep 17 00:00:00 2001
From: BlackHole <black-hole@live.com>
Date: Tue, 16 Jul 2013 22:34:50 +0200
Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT

2
CraftBukkit-Patches/0055-Allow-Disabling-of-1.6.3-Structure-Saving.patch → CraftBukkit-Patches/0054-Allow-Disabling-of-1.6.3-Structure-Saving.patch
View File

@ -1,4 +1,4 @@
From 7ac90b95f5e78b0cc8c73bcb29d6cf58e7ed74ab Mon Sep 17 00:00:00 2001
From 8a5b1d5de7ba483d44719957ec566895949f6d4d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 21 Sep 2013 12:33:09 +1000
Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving

2
CraftBukkit-Patches/0056-Item-Despawn-Rate.patch → CraftBukkit-Patches/0055-Item-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From 271b8162947d0cb71d237b42f39ca03135732626 Mon Sep 17 00:00:00 2001
From e390045e8083aa77ebb244ed0cca6b40152acd7f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate

2
CraftBukkit-Patches/0057-Don-t-Special-Case-X-Move-Value.patch → CraftBukkit-Patches/0056-Don-t-Special-Case-X-Move-Value.patch
View File

@ -1,4 +1,4 @@
From 8a7f776a29346183920d5c6d926e6a8f668fb7eb Mon Sep 17 00:00:00 2001
From 00c63d4d0d013c836c4ab73c88cfb756ed7b4aa6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value

2
CraftBukkit-Patches/0058-Implement-respawn-API.patch → CraftBukkit-Patches/0057-Implement-respawn-API.patch
View File

@ -1,4 +1,4 @@
From 7c1f3f5c3c8f474d3ab2bbc112e8395250408401 Mon Sep 17 00:00:00 2001
From a59e57191f00a217a60022aabbc270e68fb09060 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.

2
CraftBukkit-Patches/0059-Fix-BrewingStands-Removing-NBT-Potions.patch → CraftBukkit-Patches/0058-Fix-BrewingStands-Removing-NBT-Potions.patch
View File

@ -1,4 +1,4 @@
From 2fc45636b3b51d8e824d805e3649226a033819b5 Mon Sep 17 00:00:00 2001
From d2edd0b7da57c445ebf29d8ca8f3e0080a91a1c4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 9 Oct 2013 18:20:05 +1100
Subject: [PATCH] Fix BrewingStands Removing NBT / Potions

2
CraftBukkit-Patches/0060-Arrow-Despawn-Rate.patch → CraftBukkit-Patches/0059-Arrow-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From 1b4d13ce447c6f1c30b88e443f4e3f976bf141a0 Mon Sep 17 00:00:00 2001
From 4f5bd8af4b80ff6e6ec6cc5b639762cac9eaf1b2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate

14
CraftBukkit-Patches/0061-Watchdog-Thread.patch → CraftBukkit-Patches/0060-Watchdog-Thread.patch
View File

@ -1,22 +1,22 @@
From e33c3e986cae74b9cb85dd3488de76556bda8272 Mon Sep 17 00:00:00 2001
From 6e7e1bc596979eeb5c12bd2dbad8243610597206 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0e0de44..a55160f 100644
index 7b6e83c..839c2b1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -454,6 +454,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -463,6 +463,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.N = true;
SpigotTimings.serverTickTimer.stopTiming();
org.spigotmc.CustomTimingsHandler.tick();
+ org.spigotmc.WatchdogThread.tick();
}
// Spigot end
} else {
@@ -480,6 +481,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a((CrashReport) null);
@@ -488,6 +489,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {
@ -144,10 +144,10 @@ index 0000000..a8840c9
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6d0a08e..6e32691 100644
index 8b7c73e..4152452 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -173,4 +173,18 @@ public class SpigotConfig
@@ -167,4 +167,18 @@ public class SpigotConfig
outdatedClientMessage = transform( getString( "messages.outdated-client", outdatedClientMessage ) );
outdatedServerMessage = transform( getString( "messages.outdated-server", outdatedServerMessage ) );
}

2
CraftBukkit-Patches/0062-Fix-packed-ice-generation.patch → CraftBukkit-Patches/0061-Fix-packed-ice-generation.patch
View File

@ -1,4 +1,4 @@
From 7a08f52e0b95a83beb8dc690c18afe1cc6dc5cba Mon Sep 17 00:00:00 2001
From 1d3cc423d0fee923d1bad2d16850998a45789c0e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 17:52:14 +1100
Subject: [PATCH] Fix packed ice generation

6
CraftBukkit-Patches/0063-BungeeCord-Support.patch → CraftBukkit-Patches/0062-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 17804fab38de30d2b74e7e4fb7787db24e497de3 Mon Sep 17 00:00:00 2001
From c2948884ea9ec5d3a413a650899d358e29f26792 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -99,10 +99,10 @@ index 5219468..3c17e2f 100644
{
return getHandle().collidesWithEntities;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6e32691..acd5567 100644
index 4152452..a43c373 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -187,4 +187,14 @@ public class SpigotConfig
@@ -181,4 +181,14 @@ public class SpigotConfig
commands.put( "restart", new RestartCommand( "restart" ) );
WatchdogThread.doStart( timeoutTime, restartOnCrash );
}

2
CraftBukkit-Patches/0064-Clear-Flower-Pot-on-Drop.patch → CraftBukkit-Patches/0063-Clear-Flower-Pot-on-Drop.patch
View File

@ -1,4 +1,4 @@
From 6d318acacaca44a9cbd161cd6724f3cd6d91fa73 Mon Sep 17 00:00:00 2001
From 285ad18b80430718372d92b11d3169dc3c03441c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 3 Dec 2013 11:07:48 +1100
Subject: [PATCH] Clear Flower Pot on Drop

2
CraftBukkit-Patches/0065-Fix-some-chunks-not-being-sent-to-the-client.patch → CraftBukkit-Patches/0064-Fix-some-chunks-not-being-sent-to-the-client.patch
View File

@ -1,4 +1,4 @@
From e1b8633ae7f455bd99b94f38526b671e3795f060 Mon Sep 17 00:00:00 2001
From a23358ddd9ae5dccad3fbf6a16c93990987c19cb Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Mon, 2 Dec 2013 23:42:09 +0000
Subject: [PATCH] Fix some chunks not being sent to the client

2
CraftBukkit-Patches/0066-Fix-Broken-Async-Chat.patch → CraftBukkit-Patches/0065-Fix-Broken-Async-Chat.patch
View File

@ -1,4 +1,4 @@
From 0c9b65576d73d56f370e354823614f4169a692c3 Mon Sep 17 00:00:00 2001
From 5efbb67b37199034112875440a9e250448177f25 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 5 Dec 2013 13:55:53 +1100
Subject: [PATCH] Fix Broken Async Chat

4
CraftBukkit-Patches/0067-Allow-Teleportation-of-Vehicles-and-Passengers.patch → CraftBukkit-Patches/0066-Allow-Teleportation-of-Vehicles-and-Passengers.patch
View File

@ -1,11 +1,11 @@
From 1315e025f9551a083447eec06b8c579d276af77b Mon Sep 17 00:00:00 2001
From 5c69c193f3ea57e986c6c66e306b62b41721448d Mon Sep 17 00:00:00 2001
From: ItsHarry <info@itsjerryandharry.com>
Date: Thu, 5 Dec 2013 21:58:11 +0100
Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 52c75f0..c9454b5 100644
index 3c17e2f..4fa4142 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -430,9 +430,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
CraftBukkit-Patches/0068-Remove-OS-X-Special-Chars-from-Signs.patch → CraftBukkit-Patches/0067-Remove-OS-X-Special-Chars-from-Signs.patch
View File

@ -1,4 +1,4 @@
From 3bf7534db49e538787ec84cc0fabd79bd691a2c3 Mon Sep 17 00:00:00 2001
From 5d7b5a54c8934babbd9e8250971df954ecea9c61 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 8 Dec 2013 16:52:42 +1100
Subject: [PATCH] Remove OS X Special Chars from Signs

2
CraftBukkit-Patches/0069-Orebfuscator.patch → CraftBukkit-Patches/0068-Orebfuscator.patch
View File

@ -1,4 +1,4 @@
From 65f36750e5bee16a364326103d42a0cda40fac42 Mon Sep 17 00:00:00 2001
From e41971932fa4ae46d673cad92d8f66a2bf85cfdb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator

2
CraftBukkit-Patches/0070-Optimize-DataWatcher.patch → CraftBukkit-Patches/0069-Optimize-DataWatcher.patch
View File

@ -1,4 +1,4 @@
From f99145bc8ce6b6271eb785d89f13e9b3d0ba47c5 Mon Sep 17 00:00:00 2001
From 97a4d307554c92c124c5c29167ff5cd83cbb385a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:45:47 +1100
Subject: [PATCH] Optimize DataWatcher

2
CraftBukkit-Patches/0071-Allow-Disabling-Zombie-Villager-Aggression.patch → CraftBukkit-Patches/0070-Allow-Disabling-Zombie-Villager-Aggression.patch
View File

@ -1,4 +1,4 @@
From 5df9392ef7ee1760da1f9d62facd50b06cf7c4ec Mon Sep 17 00:00:00 2001
From 2868183681ae3cda43117854763c2d2407266234 Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Thu, 12 Dec 2013 18:05:03 -0600
Subject: [PATCH] Allow Disabling Zombie Villager Aggression

12
CraftBukkit-Patches/0072-Configurable-Amount-of-Netty-Threads.patch → CraftBukkit-Patches/0071-Configurable-Amount-of-Netty-Threads.patch
View File

@ -1,4 +1,4 @@
From a9ac8accb027efbd0292d9d4e185a3c017c40054 Mon Sep 17 00:00:00 2001
From 7ea36e2d301483a4351362cf6aba8704ef406a01 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a55160f..ccf7abd 100644
index 839c2b1..b59a6d8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -51,7 +51,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -18,7 +18,7 @@ index a55160f..ccf7abd 100644
private final ServerPing p = new ServerPing();
private final Random q = new Random();
private String serverIp;
@@ -111,7 +111,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -106,7 +106,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
i = this;
this.c = proxy;
// this.universe = file1; // CraftBukkit
@ -27,7 +27,7 @@ index a55160f..ccf7abd 100644
this.n = new CommandDispatcher();
// this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init
this.S = (new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString())).createMinecraftSessionService();
@@ -1219,7 +1219,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -1227,7 +1227,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public ServerConnection ag() {
@ -37,10 +37,10 @@ index a55160f..ccf7abd 100644
public boolean ai() {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index acd5567..c4a5488 100644
index a43c373..19f2822 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -197,4 +197,11 @@ public class SpigotConfig
@@ -191,4 +191,11 @@ public class SpigotConfig
}
bungee = getBoolean( "settings.bungeecord", false );
}

2
CraftBukkit-Patches/0073-Prevent-Mineshaft-Saving.patch → CraftBukkit-Patches/0072-Prevent-Mineshaft-Saving.patch
View File

@ -1,4 +1,4 @@
From d46c3a0d4bc6fa47ebd5730fb727ba5e219e5a15 Mon Sep 17 00:00:00 2001
From 1044478f8b2dc088f39c504c3b61cb35e2dc356d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 15:21:02 +1100
Subject: [PATCH] Prevent Mineshaft Saving

8
CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch → CraftBukkit-Patches/0073-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
View File

@ -1,4 +1,4 @@
From 1e8478189ab8e3c19971d100eeb66ea74625a5e3 Mon Sep 17 00:00:00 2001
From caef5c99c37e68d746b563cc248943463a85b85f Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:32:15 +1100
Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@ -80,7 +80,7 @@ index 0ac8f52..1648d0e 100644
public List<String> tabCompleteChat(Player player, String message) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index c4a5488..b3f2647 100644
index 19f2822..56767ac 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;
@ -97,9 +97,9 @@ index c4a5488..b3f2647 100644
import org.bukkit.command.Command;
+import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
@@ -204,4 +206,17 @@ public class SpigotConfig
public class SpigotConfig
@@ -198,4 +200,17 @@ public class SpigotConfig
System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
}

2
CraftBukkit-Patches/0075-Fire-PreLogin-Events-in-Offline-Mode.patch → CraftBukkit-Patches/0074-Fire-PreLogin-Events-in-Offline-Mode.patch
View File

@ -1,4 +1,4 @@
From 5a3992ffafbf04a0fbb871b51d845cd14f070ec0 Mon Sep 17 00:00:00 2001
From 9ec255571174d13504b89b03e0625ec93ae1291b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:32:10 +1100
Subject: [PATCH] Fire PreLogin Events in Offline Mode

6
CraftBukkit-Patches/0076-Log-Cause-of-Unexpected-Exceptions.patch → CraftBukkit-Patches/0075-Log-Cause-of-Unexpected-Exceptions.patch
View File

@ -1,14 +1,14 @@
From 96112e90b66c38f472a93f5c133af24d6c87a69f Mon Sep 17 00:00:00 2001
From 8d4743eb93c2bf94b875c691c253318259292b97 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:39:14 +1100
Subject: [PATCH] Log Cause of Unexpected Exceptions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ccf7abd..6410f32 100644
index b59a6d8..c520fe7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -462,6 +462,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -470,6 +470,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
} catch (Throwable throwable) {
h.error("Encountered an unexpected exception", throwable);

4
CraftBukkit-Patches/0077-Particle-API.patch → CraftBukkit-Patches/0076-Particle-API.patch
View File

@ -1,4 +1,4 @@
From e474b6f9b33af77e3a7f64b0b46d8837568c6c6e Mon Sep 17 00:00:00 2001
From 2095b2dd8dea14d125a67013ec25158c85195bd5 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -117,5 +117,5 @@ index 468a4e1..c90dd54 100644
public Spigot spigot()
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0078-Fix-Biome-Decoration-Crashes.patch → CraftBukkit-Patches/0077-Fix-Biome-Decoration-Crashes.patch
View File

@ -1,4 +1,4 @@
From dfeec72862e67c4fb08e1f11962717cc99e81e5a Mon Sep 17 00:00:00 2001
From af606d138eeee9a5a8ddd4174f4ba408b7c4c8c8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 5 Jan 2014 09:35:01 +1100
Subject: [PATCH] Fix Biome Decoration Crashes
@ -107,5 +107,5 @@ index b048d6c..962d719 100644
+ // Spigot End
}
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0079-Save-ticks-lived-to-nbttag.patch → CraftBukkit-Patches/0078-Save-ticks-lived-to-nbttag.patch
View File

@ -1,4 +1,4 @@
From 59270de3d66b10b895713ea1a4c8abcf59584716 Mon Sep 17 00:00:00 2001
From 380d4150ebcf38e7ff9da7e16ceb864588f0dbf8 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag
@ -26,5 +26,5 @@ index 9ef9f88..84bac83 100644
if (entity instanceof EntityTameableAnimal && !isLevelAtLeast(nbttagcompound, 2) && !nbttagcompound.getBoolean("PersistenceRequired")) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0080-More-Efficient-GetCubes.patch → CraftBukkit-Patches/0079-More-Efficient-GetCubes.patch
View File

@ -1,4 +1,4 @@
From 0fb2802696244681df560cb73a9ff464a47914a6 Mon Sep 17 00:00:00 2001
From f0ed5217da8461370856ab85c01932026f4edd91 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:17:37 +1000
Subject: [PATCH] More Efficient GetCubes
@ -64,5 +64,5 @@ index 1aca7f6..04f5ed1 100644
double d0 = 0.25D;
List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
--
1.8.4.msysgit.0
1.8.3.2

2
CraftBukkit-Patches/0081-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch → CraftBukkit-Patches/0080-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View File

@ -1,4 +1,4 @@
From 41cb6d4ca3f46f4eb9640298e2dc790c072c4ee4 Mon Sep 17 00:00:00 2001
From d7657d89d975e4db8e20fe01b80182a64ad0d0e9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 22 Dec 2013 20:58:02 +1100
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's

4
CraftBukkit-Patches/0082-Warn-if-PermGen-may-be-insufficient.patch → CraftBukkit-Patches/0081-Warn-if-PermGen-may-be-insufficient.patch
View File

@ -1,4 +1,4 @@
From 9c7daa9543db10418630043186271c9a49535127 Mon Sep 17 00:00:00 2001
From 79b1556a3f83cc53c8ef6260f5897495fa595225 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 14:07:41 +1100
Subject: [PATCH] Warn if PermGen may be insufficient
@ -31,5 +31,5 @@ index 07c26f1..7e7b1ec 100644
MinecraftServer.main(options);
} catch (Throwable t) {
--
1.8.4.msysgit.0
1.8.3.2

2
CraftBukkit-Patches/0083-Disable-Connected-Check-on-setScoreboard.patch → CraftBukkit-Patches/0082-Disable-Connected-Check-on-setScoreboard.patch
View File

@ -1,4 +1,4 @@
From d5c1d277f9e2290c11a3d43033e0789a38f7bb4a Mon Sep 17 00:00:00 2001
From 67ce7323ec739babf894b6dc2f5256d496a5d1b7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard

8
CraftBukkit-Patches/0084-Add-Late-Bind-Option.patch → CraftBukkit-Patches/0083-Add-Late-Bind-Option.patch
View File

@ -1,4 +1,4 @@
From 4f0db695940594818b0c7be8f3f91422fe28a332 Mon Sep 17 00:00:00 2001
From d5a5c3bed0ddd583c4cd80da21c9e1dfeace2d54 Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option
@ -56,10 +56,10 @@ index c9bb3a6..8ec6474
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
old mode 100644
new mode 100755
index b3f2647..4811778
index 56767ac..e11e2b8
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -219,4 +219,9 @@ public class SpigotConfig
@@ -213,4 +213,9 @@ public class SpigotConfig
VanillaCommandWrapper.allowedCommands.add( command );
}
}
@ -70,5 +70,5 @@ index b3f2647..4811778
+ }
}
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0085-Disconnect-for-spam-in-the-main-thread.patch → CraftBukkit-Patches/0084-Disconnect-for-spam-in-the-main-thread.patch
View File

@ -1,4 +1,4 @@
From 9eadce08d9f2cf5315756d94f0a1d9fdfbeeb9d3 Mon Sep 17 00:00:00 2001
From bb7fa8838e6ec0bfefb57159d8e33dc0e06cf6d2 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 3 Jan 2014 17:30:52 +0000
Subject: [PATCH] Disconnect for spam in the main thread
@ -38,5 +38,5 @@ index 1903362..f7fdca3 100644
}
}
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0086-Update-Chest-Animation-when-Cancelling-Event.patch → CraftBukkit-Patches/0085-Update-Chest-Animation-when-Cancelling-Event.patch
View File

@ -1,4 +1,4 @@
From ec7cba889f9934f5b1cc49c241dfd86a4ee0c797 Mon Sep 17 00:00:00 2001
From dd3022afd3bbb648f0c2fbb9b0ea543337145f83 Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Mon, 6 Jan 2014 16:29:51 -0500
Subject: [PATCH] Update Chest Animation when Cancelling Event
@ -113,5 +113,5 @@ index ab39926..550ef44 100644
if (this.activeContainer != this.defaultContainer) {
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0087-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch → CraftBukkit-Patches/0086-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
View File

@ -1,4 +1,4 @@
From b67eeecbc4d4eca02e6350e558e3bb10caf0e3c0 Mon Sep 17 00:00:00 2001
From 9762f6aa69c704beaaedf9c7978c3f471e9a5e9e Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Mon, 6 Jan 2014 18:02:01 -0500
Subject: [PATCH] Update Client's Hand when BlockPlaceEvent Cancelled
@ -31,5 +31,5 @@ index f7fdca3..91de23b 100644
flag = true;
--
1.8.4.msysgit.0
1.8.3.2

10
CraftBukkit-Patches/0088-Allow-statistics-to-be-disabled-forced.patch → CraftBukkit-Patches/0087-Allow-statistics-to-be-disabled-forced.patch
View File

@ -1,4 +1,4 @@
From 4c5d07c4c8f28bbd42b3bf4445d8e7d4c6bd769b Mon Sep 17 00:00:00 2001
From 5c295074ef0b943acc0100871b2aec1dfa5ed3bc Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
@ -40,7 +40,7 @@ index 2f980cb..3f78728 100644
super.a(entityhuman, statistic, i);
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 4811778..8e53b55 100755
index e11e2b8..205249e 100755
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -11,11 +11,14 @@ import java.util.HashMap;
@ -56,9 +56,9 @@ index 4811778..8e53b55 100755
import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
@@ -224,4 +227,31 @@ public class SpigotConfig
public class SpigotConfig
@@ -218,4 +221,31 @@ public class SpigotConfig
private static void lateBind() {
lateBind = getBoolean( "settings.late-bind", false );
}
@ -91,5 +91,5 @@ index 4811778..8e53b55 100755
+ }
}
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0089-Fix-anvil-collisions.patch → CraftBukkit-Patches/0088-Fix-anvil-collisions.patch
View File

@ -1,4 +1,4 @@
From b995049e7e282c0e217cc4db1043a947a87d89ce Mon Sep 17 00:00:00 2001
From 8a5fbfc82857d44bf242a65884aad5e52efe0592 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Thu, 9 Jan 2014 14:19:12 +0000
Subject: [PATCH] Fix anvil collisions
@ -25,5 +25,5 @@ index 9e1ce2f..1fa14c5 100644
return false;
}
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0090-Fix-ItemStack-Unbreakable-Code.patch → CraftBukkit-Patches/0089-Fix-ItemStack-Unbreakable-Code.patch
View File

@ -1,4 +1,4 @@
From 049ab256099deffea5f89022629ababe8dcfcfa5 Mon Sep 17 00:00:00 2001
From aae88abcb7bff6c316cbc4028b3bbf79d4e4617c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 10 Jan 2014 15:15:50 +1100
Subject: [PATCH] Fix ItemStack Unbreakable Code
@ -24,5 +24,5 @@ index f32322e..37ceade 100644
public boolean usesData() {
--
1.8.4.msysgit.0
1.8.3.2

8
CraftBukkit-Patches/0091-Try-and-Debug-Crash-Reports-Crashing.patch → CraftBukkit-Patches/0090-Try-and-Debug-Crash-Reports-Crashing.patch
View File

@ -1,14 +1,14 @@
From 021a758c0089cfe0111815a7053e0a4dcfac17b7 Mon Sep 17 00:00:00 2001
From 9f4f2410d074dccc2c47ee383af5db569080954e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 20:56:41 +1100
Subject: [PATCH] Try and Debug Crash Reports Crashing
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6410f32..6fd430f 100644
index c520fe7..eb7d918 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -635,7 +635,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -643,7 +643,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
try {
worldserver.doTick();
} catch (Throwable throwable) {
@ -22,7 +22,7 @@ index 6410f32..6fd430f 100644
worldserver.a(crashreport);
throw new ReportedException(crashreport);
}
@@ -643,7 +649,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -651,7 +657,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
try {
worldserver.tickEntities();
} catch (Throwable throwable1) {

6
CraftBukkit-Patches/0092-Replace-AutoSave-Mechanism.patch → CraftBukkit-Patches/0091-Replace-AutoSave-Mechanism.patch
View File

@ -1,4 +1,4 @@
From 6e38905c8bd6d8ead1e76ca8581d1842f26ae583 Mon Sep 17 00:00:00 2001
From ebd2fb5ffe43e048d383ee3d2be17c8bac908656 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Replace AutoSave Mechanism
@ -6,10 +6,10 @@ Subject: [PATCH] Replace AutoSave Mechanism
The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6fd430f..1225411 100644
index eb7d918..85e9e53 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -563,7 +563,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -571,7 +571,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
if ((this.autosavePeriod > 0) && ((this.ticks % this.autosavePeriod) == 0)) { // CraftBukkit
this.methodProfiler.a("save");
this.t.savePlayers();

4
CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch → CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch
View File

@ -1,4 +1,4 @@
From 056226c0ebd85eceb6bc83d35f12220d118bc4dc Mon Sep 17 00:00:00 2001
From f900a0cd106478ed5382d3934d9a34ef912669b9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 14 Jan 2014 20:11:25 +0000
Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@ -37,5 +37,5 @@ index 04f5ed1..ac9b669 100644
public void addIWorldAccess(IWorldAccess iworldaccess) {
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0094-Block-data-values-that-crash-the-client.patch → CraftBukkit-Patches/0093-Block-data-values-that-crash-the-client.patch
View File

@ -1,4 +1,4 @@
From 438be204a29764ce1bdda2c94bed5298ad71ec3d Mon Sep 17 00:00:00 2001
From 5c04f4e90cc99661fafbd3277c1e5080e8d90665 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 15 Jan 2014 21:52:47 +0000
Subject: [PATCH] Block data values that crash the client
@ -57,5 +57,5 @@ index 51ebb7e..944170b 100644
if (tileentity != null) {
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0095-Support-vanilla-s-direction-tag-on-fireballs.patch → CraftBukkit-Patches/0094-Support-vanilla-s-direction-tag-on-fireballs.patch
View File

@ -1,4 +1,4 @@
From 583b55f00d1755910fe5fa0c0b21bbcd0bf5e521 Mon Sep 17 00:00:00 2001
From 4398d4b87554715e4b93771a18390ea1580d380b Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 18 Jan 2014 14:27:03 +0000
Subject: [PATCH] Support vanilla's direction tag on fireballs
@ -32,5 +32,5 @@ index 82da554..d23d178 100644
this.die();
}
--
1.8.4.msysgit.0
1.8.3.2

4
CraftBukkit-Patches/0096-Support-non-prefixed-URLs.patch → CraftBukkit-Patches/0095-Support-non-prefixed-URLs.patch
View File

@ -1,4 +1,4 @@
From bf22233f1d884d0899b6e971661ebe541bcc94b4 Mon Sep 17 00:00:00 2001
From d452ada9b1e3fffbd663996f74d684ff7f1751c2 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 18 Jan 2014 19:32:42 +0000
Subject: [PATCH] Support non-prefixed URLs
@ -37,5 +37,5 @@ index 66368f4..f4de71c 100644
private void appendNewComponent(int index) {
--
1.8.4.msysgit.0
1.8.3.2

2
CraftBukkit-Patches/0097-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch → CraftBukkit-Patches/0096-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
View File

@ -1,4 +1,4 @@
From 4936e7a8d5a37a5dad22e681ce538a90e9d53685 Mon Sep 17 00:00:00 2001
From 83f40b07823892893854db7993dddb1ab5b24719 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.

4
CraftBukkit-Patches/0098-Reduce-memory-of-hiddenPlayers-map.patch → CraftBukkit-Patches/0097-Reduce-memory-of-hiddenPlayers-map.patch
View File

@ -1,11 +1,11 @@
From d5146fda6fe149caae4696f8d59ed8a24dfdc7f5 Mon Sep 17 00:00:00 2001
From ed47e5366e39215ef695905ab73c0a00b43478fe Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:50:32 +1100
Subject: [PATCH] Reduce memory of hiddenPlayers map.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 331ff29..fe63ebd 100644
index b130951..c8aa3f8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -62,7 +62,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
CraftBukkit-Patches/0099-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch → CraftBukkit-Patches/0098-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View File

@ -1,4 +1,4 @@
From af8afd23eb1bf5f0a94210f0a2b81fc9afa11ad2 Mon Sep 17 00:00:00 2001
From 88c534763961d202a4e6c035ab86a76beb6d0148 Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks

4
CraftBukkit-Patches/0100-Don-t-let-trees-replace-any-block-when-growing.patch → CraftBukkit-Patches/0099-Don-t-let-trees-replace-any-block-when-growing.patch
View File

@ -1,4 +1,4 @@
From 5922d8a6287ae42098999994a8596e99ca181da1 Mon Sep 17 00:00:00 2001
From 83d1c5d1f193076363b7e80dba3fecf34bcd496b Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Mon, 20 Jan 2014 20:42:28 +0000
Subject: [PATCH] Don't let trees replace any block when growing
@ -23,5 +23,5 @@ index 71ce973..caaac9a 100644
int l3;
--
1.8.4.msysgit.0
1.8.3.2

26
CraftBukkit-Patches/0014-Highly-Optimized-Tick-Loop.patch → CraftBukkit-Patches/0100-Highly-Optimized-Tick-Loop.patch
View File

@ -1,11 +1,11 @@
From 152b956a0d94edd3c7384e084e174f69f53238d9 Mon Sep 17 00:00:00 2001
From 704af76ef5f2f961623aa145c110df9e651fe2cf Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 22 Jan 2014 19:14:15 +1100
Subject: [PATCH] Highly Optimized Tick Loop
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6a01982..7dabffb 100644
index 85e9e53..1225411 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -101,6 +101,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -20,7 +20,7 @@ index 6a01982..7dabffb 100644
public MinecraftServer(OptionSet options, Proxy proxy) { // CraftBukkit - signature file -> OptionSet
i = this;
@@ -429,38 +434,25 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -429,42 +434,29 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.p.setServerInfo(new ServerPingServerData("1.7.2", 4));
this.a(this.p);
@ -62,12 +62,16 @@ index 6a01982..7dabffb 100644
+ catchupTime = Math.min(1000000000, Math.abs(wait));
}
-
- Thread.sleep(1L);
+ currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
+ lastTick = curTime;
+ MinecraftServer.currentTick++;
SpigotTimings.serverTickTimer.startTiming();
- Thread.sleep(1L);
+ this.t();
this.N = true;
SpigotTimings.serverTickTimer.stopTiming();
org.spigotmc.CustomTimingsHandler.tick();
org.spigotmc.WatchdogThread.tick();
}
+ // Spigot end
} else {
@ -115,20 +119,20 @@ index 0000000..f114a31
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 3dfe4ed..1b0e1bf 100644
index 205249e..4319e9b 100755
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -14,6 +14,7 @@ import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -20,6 +20,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
public class SpigotConfig
{
@@ -117,4 +118,9 @@ public class SpigotConfig
config.addDefault( path, def );
return config.getString( path, config.getString( path ) );
@@ -248,4 +249,9 @@ public class SpigotConfig
"screen." );
}
}
+
+ private static void tpsCommand()