OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to Minecraft 1.8.6

Browse source
This commit is contained in:
md_5 2015-05-25 22:05:40 +10:00 committed by Zach Brown
parent ebb90ceeae
commit 2c46441a7b
185 changed files with 301 additions and 301 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0001-POM-Changes.patch
View file

@ -1,11 +1,11 @@
From f1cb30a12af3222fecbc28cad6d8df59ff4963b6 Mon Sep 17 00:00:00 2001
From 8a45243cbfa1e3db958002fe4f0c24d4c2f3f159 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index a26d96b..7775718 100644
index ed68803..2cc6c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
@ -16,7 +16,7 @@ index a26d96b..7775718 100644
- <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.8.5-R0.1-SNAPSHOT</version>
<version>1.8.6-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Bukkit</name>

2
Bukkit-Patches/0002-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 1a62f1feadb23a51bba04813d45ba8fedfed242a Mon Sep 17 00:00:00 2001
From 7087e5182440a2bd37ae53dccdfeca2ab0ed11f8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings

4
Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch
View file

@ -1,4 +1,4 @@
From 2d18e44b5ee7f59b3f7844a138d64bbab7d580fd Mon Sep 17 00:00:00 2001
From d1fb850ed9fe49904a166451978cf4701fc66069 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:31:20 +1100
Subject: [PATCH] Add PlayerItemDamageEvent
@ -65,5 +65,5 @@ index 0000000..38a72ab
+ }
+}
--
2.1.0
2.1.4

4
Bukkit-Patches/0004-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From eb486ea6ea78b6824f4cecddc34f9423987edeb9 Mon Sep 17 00:00:00 2001
From 635849b293923601730cdf18a99a9437b6fa2a96 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
@ -99,5 +99,5 @@ index 68834dd..4bc024f 100644
* Gets the current result of the login, as an enum
*
--
2.1.0
2.1.4

4
Bukkit-Patches/0005-Add-Arrow-API.patch
View file

@ -1,4 +1,4 @@
From 739d7342a19667e1f12587cb156d1b1f1fa3cacf Mon Sep 17 00:00:00 2001
From 6df1a1942db9ba0c51f5d0d44755e7fc6c178b1f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:08:24 +1000
Subject: [PATCH] Add Arrow API
@ -30,5 +30,5 @@ index e49eef0..e7a32f7 100644
+ Spigot spigot();
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0006-Add-Particle-API.patch
View file

@ -1,4 +1,4 @@
From db57ed2aee8b42ecec7af16e017c96fdcd387672 Mon Sep 17 00:00:00 2001
From 01f99fc968bc61b744aadedbbce25d2ed91fcf6c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
@ -365,5 +365,5 @@ index 08aa71d..5217aec 100644
}
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From 7862f270a5ff8a6a7a57dbaf474145be2d237b15 Mon Sep 17 00:00:00 2001
From 881e18a4165bda3606d6f8a56b70fdda366d1570 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:01 -0500
Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
@ -216,5 +216,5 @@ index 0000000..1acb3c4
+ }
+}
--
2.1.0
2.1.4

4
Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,4 +1,4 @@
From c5ed18ba089e160a53c54b4ace4403e10535d6bb Mon Sep 17 00:00:00 2001
From 25b939248a75194bf269587f6b32967ff9dd50a0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:53 +1000
Subject: [PATCH] Entity Mount and Dismount Events
@ -108,5 +108,5 @@ index 0000000..16aa2a7
+ }
+}
--
2.1.0
2.1.4

4
Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch
View file

@ -1,4 +1,4 @@
From 5ae9c2efd241a76cc711525ca4326d426801eadc Mon Sep 17 00:00:00 2001
From 448b8cd86c63dc50bf5479506b85814595387256 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 7 Jul 2013 10:32:05 -0400
Subject: [PATCH] InventoryClickEvent getClickedInventory
@ -50,5 +50,5 @@ index 28198b8..3313d91 100644
*
* @return the slot type
--
2.1.0
2.1.4

4
Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch
View file

@ -1,4 +1,4 @@
From 47931fc43414c74c78ed3409360d26669b1ff2a8 Mon Sep 17 00:00:00 2001
From c502417b8d25ebeb61357371aeec2e64d71aec25 Mon Sep 17 00:00:00 2001
From: Alex Bennett <alex.eugene.bennett@gmail.com>
Date: Thu, 11 Jul 2013 15:31:32 -0500
Subject: [PATCH] Added getAllSessionData() to the Conversation API.
@ -24,5 +24,5 @@ index 4f33ff4..7390a77 100644
* this as a way to pass data through each Prompt as the conversation
* develops.
--
2.1.0
2.1.4

4
Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch
View file

@ -1,4 +1,4 @@
From 3e6af070752f6e1756f4e4e444fb1ac3e92e9783 Mon Sep 17 00:00:00 2001
From dae3333416b4cb55f40217339e635d32f9516864 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 22 Jul 2013 19:09:43 +1000
Subject: [PATCH] Catch Conversation API Errors
@ -30,5 +30,5 @@ index d4c1f6d..46912c8 100644
/**
--
2.1.0
2.1.4

4
Bukkit-Patches/0012-Player-Collision-API.patch
View file

@ -1,4 +1,4 @@
From 84f12c10d66a4f878032a1fdf7316e3044c4dfa6 Mon Sep 17 00:00:00 2001
From a8a5d39f2fd96465b66ec5f9f17a8a6ae3bda9f5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
@ -37,5 +37,5 @@ index 0810c68..597bca1 100644
Spigot spigot();
--
2.1.0
2.1.4

4
Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch
View file

@ -1,4 +1,4 @@
From dd8287e344e0def1c8cfb6f97d25dade30efed02 Mon Sep 17 00:00:00 2001
From 8b2b862220b72654e09a83db71a8480dea4b374f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:42:16 +1000
Subject: [PATCH] Expand Boolean Prompt Values
@ -24,5 +24,5 @@ index 3f2c97f..81ef78c 100644
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,4 +1,4 @@
From 1de51bb79c14ddc6f82312bfce4f715bdea119e2 Mon Sep 17 00:00:00 2001
From 33bcec116a7d0b271a247aa325c288cebceab936 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:49:36 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability
@ -32,5 +32,5 @@ index de7815f..7fb08af 100644
+ // Spigot End
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0015-Add-respawn-API.patch
View file

@ -1,4 +1,4 @@
From 3632b30fbdb53e687105534c778660271aba4139 Mon Sep 17 00:00:00 2001
From f07f6b66ac42640bcd481710667e02ba494f29be Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:35:58 +0200
Subject: [PATCH] Add respawn API.
@ -24,5 +24,5 @@ index 597bca1..da4da7c 100644
Spigot spigot();
--
2.1.0
2.1.4

4
Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch
View file

@ -1,4 +1,4 @@
From c10d11b324d23598760948181d1071c27ba5fe8d Mon Sep 17 00:00:00 2001
From cbf5dc1f5e2241264419592fdc12a73997f270bb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 19 Oct 2013 12:59:42 +1100
Subject: [PATCH] Fix Plugin Message API Disconnects
@ -26,5 +26,5 @@ index a906f8d..4c171e8 100644
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch
View file

@ -1,4 +1,4 @@
From 800263a2dffc256a03dea9f5fbf55c0b6655a4b8 Mon Sep 17 00:00:00 2001
From 183a4b3be424e009fc996e7baf6d88de15805652 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 24 Dec 2013 10:14:25 +1100
Subject: [PATCH] Fix Tab Completion for Some Commands
@ -81,5 +81,5 @@ index 7e5494d..e168b49 100644
+ // Spigot End
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
View file

@ -1,4 +1,4 @@
From ac6fd9bc362fbc79e4746a883029f4820d40d5ff Mon Sep 17 00:00:00 2001
From 5958f1a4d759ddbb6df71a76dce144d979ee94d7 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:10:49 +1100
Subject: [PATCH] Implement Locale Getter for Players
@ -26,5 +26,5 @@ index da4da7c..57e6eae 100644
Spigot spigot();
--
2.1.0
2.1.4

4
Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
View file

@ -1,4 +1,4 @@
From 3b771013b8c082fa2616646d58080b71f38857c5 Mon Sep 17 00:00:00 2001
From b3f637a30ead745921e73bc6bf54be21bc25b23a Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players
@ -26,5 +26,5 @@ index 57e6eae..7ed0f6a 100644
Spigot spigot();
--
2.1.0
2.1.4

4
Bukkit-Patches/0020-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 9b9a1b210f0d8ef1bb5709c13b5081966b1b5438 Mon Sep 17 00:00:00 2001
From 2da3867ab296fef727f7a85a2af2f8c08ad5552c Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
@ -66,5 +66,5 @@ index c8b5154..1ed4ac9 100644
+ Spigot spigot();
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch
View file

@ -1,4 +1,4 @@
From 2d012a8bccfa96afa182bf96a0daaff4889f0d12 Mon Sep 17 00:00:00 2001
From 59c2dab8155fa5d479c75d45ffbcc719fd5d4871 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 30 Mar 2014 15:58:22 +1100
Subject: [PATCH] Remove deprecation on some player lookup methods
@ -90,5 +90,5 @@ index a57d506..57b2794 100644
/**
--
2.1.0
2.1.4

4
Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
View file

@ -1,4 +1,4 @@
From c9dfbfd4fcf780e9d9ee84781b9eb86134c3a27a Mon Sep 17 00:00:00 2001
From 9c4aae143d9dc26ef36e30c819fa4ad97f9801cb Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 17 Apr 2014 19:22:26 +1000
Subject: [PATCH] Expand team API to allow arbitrary strings.
@ -71,5 +71,5 @@ index e6d1442..2bd78e3 100644
+ // Spigot end
}
--
2.1.0
2.1.4

4
Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch
View file

@ -1,4 +1,4 @@
From 7aee846094b100f670a353efbc8918255aae8a5a Mon Sep 17 00:00:00 2001
From cf631eb590b0bd2757c43114604659679251b8d9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 17 Apr 2014 19:35:13 +1000
Subject: [PATCH] Add Score.isScoreSet()Z API.
@ -27,5 +27,5 @@ index 4c10346..2410cbd 100644
* Gets the scoreboard for the associated objective.
*
--
2.1.0
2.1.4

4
Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch
View file

@ -1,4 +1,4 @@
From 71ef19ac9942dca56ccad73421ef801368d58cc6 Mon Sep 17 00:00:00 2001
From da0f36b3061dede561dfab0e831e555fc8a71886 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:01:32 +0200
Subject: [PATCH] Add PlayerSpawnLocationEvent.
@ -61,5 +61,5 @@ index 0000000..dd3f58c
+ }
+}
--
2.1.0
2.1.4

6
Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch
View file

@ -1,4 +1,4 @@
From 314a5046edb39a82c652c586a115517209edccdd Mon Sep 17 00:00:00 2001
From a62698171547806cae2eb4b3cac7408c01b6c074 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 16 Jul 2014 17:24:21 +1000
Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
@ -6,7 +6,7 @@ Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
When on Java 7 we can register the classloader as parallel capable to prevent deadlocks caused by certain scenarios. Due to the nature of PluginClassLoader this isn't completely safe, but we can make it safer by switching to concurrency focused collections. Either way this is far better than crashing the server.
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index b081ecb..0ac8325 100644
index cd843f4..7bf2fa6 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -48,7 +48,7 @@ import org.yaml.snakeyaml.error.YAMLException;
@ -63,5 +63,5 @@ index 13f8633..4cffa13 100644
super(new URL[] {file.toURI().toURL()}, parent);
Validate.notNull(loader, "Loader cannot be null");
--
2.1.0
2.1.4

4
Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch
View file

@ -1,4 +1,4 @@
From 1d140f622f04696aac22e605d2ed49e0688dbcdc Mon Sep 17 00:00:00 2001
From 03ba1b9d5a03c6c9632efb0f845ee707fe8d652a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 22 Jul 2014 21:01:32 +1000
Subject: [PATCH] Fix slow tab complete for some commands.
@ -19,5 +19,5 @@ index 92de43c..855f560 100644
if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) {
completions.add(name);
--
2.1.0
2.1.4

4
Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,4 +1,4 @@
From 82904bf5b902199c2615a81ddb4a89ca358f406f Mon Sep 17 00:00:00 2001
From 12038bfe5f1bbfb36a0e0b74528c3680a02b2794 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Wed, 23 Jul 2014 15:50:36 -0400
Subject: [PATCH] Undeprecate Player#updateInventory()V
@ -21,5 +21,5 @@ index 7ed0f6a..b55d70e 100644
/**
--
2.1.0
2.1.4

4
Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View file

@ -1,4 +1,4 @@
From cf511ed7cea31987804c0af79bb78f7ee8b2893a Mon Sep 17 00:00:00 2001
From bba59a058b2f6d6bd80355d6cd9a5f376fe7825d Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:31:04 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
@ -42,5 +42,5 @@ index 459e09c..d8cc821 100644
+ // Spigot end
}
--
2.1.0
2.1.4

6
Bukkit-Patches/0029-BungeeCord-Chat-API.patch
View file

@ -1,11 +1,11 @@
From 6dff977727209092ca5a546d7a5ed3c8845bebe2 Mon Sep 17 00:00:00 2001
From 674737df7ba00a59b6fd832619dd04d3ca673cd7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 12:59:14 +1100
Subject: [PATCH] BungeeCord Chat API
diff --git a/pom.xml b/pom.xml
index 78f50bd..3e52a20 100644
index 2cc6c69..a8cde4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,14 @@
@ -82,5 +82,5 @@ index b55d70e..8eb781e 100644
Spigot spigot();
--
2.1.0
2.1.4

6
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,4 +1,4 @@
From 846140a136ee89b1bb54cff2c02d5dc2d5124c4a Mon Sep 17 00:00:00 2001
From 97e0492b1f6b41154e95116b9a01bc14159320aa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index 4cecb88..f15cc07 100644
index 5ad55dc..99fe937 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -18,7 +18,7 @@ index 4cecb88..f15cc07 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.8.5-R0.1-SNAPSHOT</version>
<version>1.8.6-R0.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>

2
CraftBukkit-Patches/0002-mc-dev-imports.patch
View file

@ -1,4 +1,4 @@
From cf7c6c8710b54f1a7451163c6aab72baf7865e42 Mon Sep 17 00:00:00 2001
From 68660010d2f0ede16bb79d23a7d2b45780152cbf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports

6
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From f8adc00eb44d01b70012f7247e4e5e76813ced4d Mon Sep 17 00:00:00 2001
From 24bfb6d05f0a60acec83e0327d4c042d6f17ed12 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -104,7 +104,7 @@ index 64e346d..243e8e5 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 16a35b8..c1879f4 100644
index e229dc0..9396b93 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1313,4 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -192,5 +192,5 @@ index ce42b30..342d4af 100644
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0004-Obfuscation-Helpers.patch
View file

@ -1,4 +1,4 @@
From 81ac39d4872b1c7aafdb5d97d52d300cd9fe8cf1 Mon Sep 17 00:00:00 2001
From 66a4f410c044c124e0f1cd31a53d6808f05d1dff Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 10:38:04 +1000
Subject: [PATCH] Obfuscation Helpers
@ -6,7 +6,7 @@ Subject: [PATCH] Obfuscation Helpers
Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f82dffc..4393458 100644
index 7b2bedb..4941eed 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1290,6 +1290,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

8
CraftBukkit-Patches/0005-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From 8da8982b64580b634950760eecc6e828066f436e Mon Sep 17 00:00:00 2001
From 7aa8f30d33ee7c3805cd69598a52f256e19159a0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -6,10 +6,10 @@ Subject: [PATCH] Spigot Configuration
Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index c922b4c..fc5e8cf 100644
index 1094be8..7e440b0 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -163,6 +163,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -162,6 +162,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
if (this.R() < 0) {
this.setPort(this.propertyManager.getInt("server-port", 25565));
}
@ -21,7 +21,7 @@ index c922b4c..fc5e8cf 100644
DedicatedServer.LOGGER.info("Generating keypair");
this.a(MinecraftEncryption.b());
@@ -177,7 +182,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -176,7 +181,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}

8
CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
View file

@ -1,4 +1,4 @@
From b77b6805e5dbf69e76e5dc928f9ed9129228e14c Mon Sep 17 00:00:00 2001
From 433014e997da1ba1f03bfa2cfda97558e18ace8d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection
@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection
An optimized chunk ticking algorithm which better selects chunks around players which are active on the server.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 52e3cfa..75e0714 100644
index 0356d9e..c81f673 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@ -112,7 +112,7 @@ index 52e3cfa..75e0714 100644
this.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 40e63fc..5fd3934 100644
index 5faefba..03cac6e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -357,12 +357,15 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -193,5 +193,5 @@ index 961ddb4..90a227f 100644
+ }
}
--
2.1.0
2.1.4

4
CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
View file

@ -1,4 +1,4 @@
From 70e45bd978fa1d1dd51e1e8597e1443f3215beab Mon Sep 17 00:00:00 2001
From b9e008279870787a67daf990e60c5c3c71f95223 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:17:20 +1000
Subject: [PATCH] Crop Growth Rates
@ -172,5 +172,5 @@ index 90a227f..7e79ba5 100644
+ }
}
--
2.1.0
2.1.4

2
CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From 9ef3f73eede644ade5f6039f631806b6c688c4d5 Mon Sep 17 00:00:00 2001
From bfbf7675709d97ce57abc5a7a78e1acb3716a350 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration

2
CraftBukkit-Patches/0009-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From f1fbe73a279beb21f8f68866cd39e0938b58ab9c Mon Sep 17 00:00:00 2001
From 9be637512105ef94ff3f673c0cae43bcb199173e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching

2
CraftBukkit-Patches/0010-View-Distance.patch
View file

@ -1,4 +1,4 @@
From d9fedfa532dd1f937fcea3a779a1fd0a2b9dce7f Mon Sep 17 00:00:00 2001
From 3851ac651a87a6d9241935fe20db52f031ba2b7b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance

14
CraftBukkit-Patches/0011-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 05dd86d1ddf919552e07ec557d26e55757fe4be6 Mon Sep 17 00:00:00 2001
From be288c6477a833de5710270c85047bd1bb0b2a86 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index fc5e8cf..3d5801c 100644
index 7e440b0..948a2f6 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -20,6 +20,7 @@ import java.io.PrintStream;
@ -117,7 +117,7 @@ index fc5e8cf..3d5801c 100644
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
@@ -369,6 +370,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -368,6 +369,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void aO() {
@ -125,7 +125,7 @@ index fc5e8cf..3d5801c 100644
while (!this.l.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.l.remove(0);
@@ -382,6 +384,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -381,6 +383,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
// CraftBukkit end
}
@ -242,7 +242,7 @@ index 2e81b7e..0638f6f 100644
this.world.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4393458..1cc4e47 100644
index 4941eed..fe61577 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -46,6 +46,7 @@ import joptsimple.OptionSet;
@ -367,7 +367,7 @@ index 4393458..1cc4e47 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2ed67e6..424ac34 100644
index 8767bc3..794464a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1063,6 +1063,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -402,7 +402,7 @@ index 2ed67e6..424ac34 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index d80bbaf..02c9250 100644
index 513712d..b8d0961 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -6,10 +6,12 @@ import java.util.concurrent.Callable;

2
CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 4d2e521609df2f20d5d1756066d443c9a1c9e800 Mon Sep 17 00:00:00 2001
From 77cfdf67693de72cbff5d5ff9e7529bcc590d31e 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/0013-Handle-Null-Tile-Entities.patch
View file

@ -1,4 +1,4 @@
From b307f13c5fa5ce775d86513090bf31effd770a40 Mon Sep 17 00:00:00 2001
From 5f633cd86ba8f838007c9d002cd871c047c837c1 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/0014-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From 3986a3a267b59d1b45e2a8dac33e47354f074ef1 Mon Sep 17 00:00:00 2001
From a23d5b334c2402c6c17bdbf7254964977c5422c9 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

2
CraftBukkit-Patches/0015-Metrics.patch
View file

@ -1,4 +1,4 @@
From f7aa249e67cd5daf82a35fbc0478ba59aac38ef7 Mon Sep 17 00:00:00 2001
From fc05d78cd33c1c9c04434b6dbc76544c62765ea4 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

2
CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch
View file

@ -1,4 +1,4 @@
From ce05d40e7bb517074413745ed2c76007e19f9208 Mon Sep 17 00:00:00 2001
From b945ad4d711097ee21e36708c69e9ffd1d6f0d97 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/0017-Prevent-NPE-in-CraftSign.patch
View file

@ -1,4 +1,4 @@
From 070fb153a784c543bef263e110b898153ec5a410 Mon Sep 17 00:00:00 2001
From 6d7b55496c097214f4bdb2acdee1b08c8767d2ad 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/0018-Entity-Tracking-Ranges.patch
View file

@ -1,4 +1,4 @@
From 1ede51990c49d26cdf03d07b30651253351fbc26 Mon Sep 17 00:00:00 2001
From 26eae42d7d1dde830ab120f6a28c161c24657534 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/0019-Thread-Naming-and-Tweaks.patch
View file

@ -1,4 +1,4 @@
From ac9d4469b570ec354dcd1de18efd608d5adb72b7 Mon Sep 17 00:00:00 2001
From 1b8f113603033107d6980169fd3f5b01eadbdfbb 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/0020-Close-Unloaded-Save-Files.patch
View file

@ -1,4 +1,4 @@
From 721126a58307ce4e03a21b7b2b3f3337d2913a32 Mon Sep 17 00:00:00 2001
From b57b4f13248edaddeb6b3be296dca129f51449c3 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/0021-Remove-o-Option.patch
View file

@ -1,4 +1,4 @@
From ec8a71fafe7d11b9fc2a7e40e9b91c055390f2c8 Mon Sep 17 00:00:00 2001
From 7003a11b6d4ce715147b1ede2c6bb8ad53ca95e3 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/0022-Recipe-Deconstruction.patch
View file

@ -1,4 +1,4 @@
From 95511de518572ab8d52f51332c06bb67babbf0af Mon Sep 17 00:00:00 2001
From 525b79b4b5bde8c12b36279773be7e2f67bdc1ad 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/0023-Implement-Arrow-API.patch
View file

@ -1,4 +1,4 @@
From 6abcfb10cc45520d7c7a0afda68cc24e5ddda18f Mon Sep 17 00:00:00 2001
From b81ecffb87848ddccf72e3a45d41c57e62aab7dc 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

4
CraftBukkit-Patches/0024-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From 3ed10d5c7954889a72db5cf893bd75f9f6ecf196 Mon Sep 17 00:00:00 2001
From a461e14b04a6b45d8c25f21f74de10c2a6e6ec56 Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Customisations
@ -6,7 +6,7 @@ Subject: [PATCH] Hopper Customisations
Allows editing hopper cooldowns and amount transferred per tick.
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index 72d067a..8e0d254 100644
index 8f771af..6785b71 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -194,12 +194,11 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU

2
CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From 8f680acc75bec4ef8a27cdb4b71056d02355023f Mon Sep 17 00:00:00 2001
From 0278976e64dfd93bc2929ef0b820f0459a103c77 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/0026-Firework-Meta-Crash-Fix.patch
View file

@ -1,4 +1,4 @@
From 6e6fc1caba9b757166acd19bc230cbd2a56acb97 Mon Sep 17 00:00:00 2001
From aa678434ade339ed00754bc9f8c80ff08d57ea6d 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

4
CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,11 +1,11 @@
From 3dfd4fc0ed6077dabd6e87ab6efe7b3d6c1aae5e Mon Sep 17 00:00:00 2001
From 4b599e4c91e96813a50e4dd2587d65e618018759 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
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 424ac34..84391af 100644
index 794464a..40fa8b7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1065,6 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

2
CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,4 +1,4 @@
From c5036b414c5ac505bf0687b9abf70d96de66c32f Mon Sep 17 00:00:00 2001
From 9a1f77ca41cb524963d196c6365f4e70f56d4589 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

12
CraftBukkit-Patches/0029-Configurable-Messages.patch
View file

@ -1,24 +1,24 @@
From 74183abb45c43c42a5f20e55bcf58e2e57f45304 Mon Sep 17 00:00:00 2001
From ce955efa982c42cf7a948bff866dd127ade52e0f 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
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index 7c4d3cc..ca92289 100644
index 796d3d3..d0374d0 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
// CraftBukkit end
if (packethandshakinginsetprotocol.b() > 47) {
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.5");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.5" ) ); // Spigot
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.6");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.6" ) ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
this.b.close(chatcomponenttext);
} else if (packethandshakinginsetprotocol.b() < 47) {
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.5");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.5" ) ); // Spigot
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.6");
+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.6" ) ); // Spigot
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
this.b.close(chatcomponenttext);
} else {

2
CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch
View file

@ -1,4 +1,4 @@
From a5f3fdc2728151d8feb670f039ee8f12d3965094 Mon Sep 17 00:00:00 2001
From 8a91b585628c6dafa3dbd14f5cfbc110ea9cf717 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/0031-Properly-Close-Inventories.patch
View file

@ -1,4 +1,4 @@
From a79c65358468bef6a3b73c0704727e9bfbcb7a66 Mon Sep 17 00:00:00 2001
From 12be96359526588a261e120b2194e8e9a857e716 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

4
CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch
View file

@ -1,11 +1,11 @@
From 5b6b5953ac1e6b01b07f1759de74402c18ce9985 Mon Sep 17 00:00:00 2001
From e0dd268fff6e3e43b0b43df156d5060c0f90d041 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
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 84391af..4fa290c 100644
index 40fa8b7..8cf0b71 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1200,6 +1200,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

2
CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,4 +1,4 @@
From 0a8a5051bd17ec33126f3ff7c71fdca402b46d27 Mon Sep 17 00:00:00 2001
From 7960af011f00e2278bdebb8a09d11b019f55ae35 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

4
CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch
View file

@ -1,4 +1,4 @@
From a08a33d56eda8fe5b45e66314979bed9669cec66 Mon Sep 17 00:00:00 2001
From 8394755568aba38313dc9ded45c0e1f4b43d2d1b 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
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 0278cfd..7b2d8d1 100644
index 825823d..665d58e 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -548,6 +548,11 @@ public abstract class PlayerList {

2
CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch
View file

@ -1,4 +1,4 @@
From 0036e4c68ff2be406d4cd8baaca791c1ceb11be2 Mon Sep 17 00:00:00 2001
From 30a420e5ff262b3c9772272fa74a0ad8711d9000 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

4
CraftBukkit-Patches/0036-Player-Collision-API.patch
View file

@ -1,4 +1,4 @@
From 2c358306a438d0788be1ea76c8d2506af0339b7c Mon Sep 17 00:00:00 2001
From f24cf33ea473b8f916f320b7796aa3be623226c8 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
@ -38,7 +38,7 @@ index f7ce391..9cd8e9b 100644
Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d356e7e..1fd636c 100644
index 9b2e06a..2fab7d1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

4
CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch
View file

@ -1,11 +1,11 @@
From a13398ce78acf3168b87dca55bbc1f09e98d9c13 Mon Sep 17 00:00:00 2001
From 164ba15fd875a5e3baf333a5952f6688add05a6a 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 1cc4e47..a0634f8 100644
index fe61577..42a2bea 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -659,11 +659,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

2
CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,4 +1,4 @@
From 36684b471f15cbc884e2ffadcaf4939ca4b7b11f Mon Sep 17 00:00:00 2001
From 45d9f27909e258188a9bf3e170e720c704783c96 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/0039-Cap-Minimum-Player-Speed.patch
View file

@ -1,4 +1,4 @@
From 2fb345e4d4a21458d0ca773fc34ee524f4c8eb81 Mon Sep 17 00:00:00 2001
From 8ad8cfeb5ef3607ff7df88c3418e482344e46055 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/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
View file

@ -1,4 +1,4 @@
From c58898dd419d22d44ad3d407eadd11262917522d Mon Sep 17 00:00:00 2001
From b4a7cd5471a376e966c3219af2ca080129a620e4 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/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
View file

@ -1,4 +1,4 @@
From b1984765de72f5464d00e8041ba7244daf960397 Mon Sep 17 00:00:00 2001
From 91a59b2aec6c0edbab9254c6e0aa0aa3e7fef12c 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/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch
View file

@ -1,4 +1,4 @@
From df701f7e9d4f96e779b7a928cfa5600f63475886 Mon Sep 17 00:00:00 2001
From f958fcbb5a38d213f7f2d55d7861f3ccc5b5ce6d 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/0043-Item-Despawn-Rate.patch
View file

@ -1,4 +1,4 @@
From d1c7dec33fba2fb2a07abf7d74c239e4f20e58b8 Mon Sep 17 00:00:00 2001
From 307fc1c27db419c44b46bac8e3c45075559762cf 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

4
CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch
View file

@ -1,11 +1,11 @@
From dd6954ab95714be55cfec586216f0561e4905d3a Mon Sep 17 00:00:00 2001
From e77ef424971b9cc45485367ec4a7a0eef3e70da0 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
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3904a80..f86f09a 100644
index 8cf0b71..0d45439 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -111,6 +111,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

2
CraftBukkit-Patches/0045-Implement-respawn-API.patch
View file

@ -1,4 +1,4 @@
From 34ce2fb1acc2f55ff365ac51faa4f6ef202a7997 Mon Sep 17 00:00:00 2001
From 902b948750e522a34c9b0837d2d0e308fd6a05f3 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/0046-Arrow-Despawn-Rate.patch
View file

@ -1,4 +1,4 @@
From 67f884819439a51b10a77eeb39c3a44ff12354df Mon Sep 17 00:00:00 2001
From faeb947ab741cda6e6e98978de18a6a1b6940d16 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

2
CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch
View file

@ -1,4 +1,4 @@
From b60d99eed5bc5e599fb908aaf00a26e5456c4a38 Mon Sep 17 00:00:00 2001
From 81d520fd1ca0268598fd90138eac3b4cd3dc4a29 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

8
CraftBukkit-Patches/0048-Watchdog-Thread.patch
View file

@ -1,14 +1,14 @@
From 7e4e39b4753cc3b320d449991267f354ffd29eb4 Mon Sep 17 00:00:00 2001
From 18d05e9dbd7e0275546b0d0332c63d303d614360 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 3d5801c..33b69c1 100644
index 948a2f6..7714dcb 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -271,7 +271,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -270,7 +270,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
// CraftBukkit end
@ -18,7 +18,7 @@ index 3d5801c..33b69c1 100644
thread1.setName("Server Watchdog");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a0634f8..270d318 100644
index 42a2bea..054a269 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -569,6 +569,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

2
CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch
View file

@ -1,4 +1,4 @@
From 7296edaa1cb0aed224ca1236d4a1a6bdb38a17fb Mon Sep 17 00:00:00 2001
From d60fd451c6d5fc23094f8323735234ab64028dd7 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/0050-Fix-some-chunks-not-being-sent-to-the-client.patch
View file

@ -1,4 +1,4 @@
From f4f1f5df831c99edd7cb8546ac56bd4d75909655 Mon Sep 17 00:00:00 2001
From 41a87da3590d7d0dcdf8a0f9ca2a97e47d8a337b 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/0051-Fix-Broken-Async-Chat.patch
View file

@ -1,4 +1,4 @@
From c0112295cbbcacd4c9b4ff1a64ac61de98b2778d Mon Sep 17 00:00:00 2001
From fd55dcc3befd0b3ec8d3ab3c4f1f9e0c0d76fdb3 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/0052-Orebfuscator.patch
View file

@ -1,4 +1,4 @@
From 87928bb1ce8d5547d586ec23cbf91ea502e22f99 Mon Sep 17 00:00:00 2001
From 4968c35def64e0c307488ea32d479d7536020434 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
@ -79,7 +79,7 @@ index 63b90f7..10c0e34 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index 0301fba..7a84a95 100644
index f2a9809..6dcf611 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -197,6 +197,7 @@ public class PlayerInteractManager {

2
CraftBukkit-Patches/0053-Optimize-DataWatcher.patch
View file

@ -1,4 +1,4 @@
From edb9783da1c312bc10c43a07095bddf53935e043 Mon Sep 17 00:00:00 2001
From 8e9ad5ba6b0da9211d0935a35cf869e18347127f 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/0054-Fire-PreLogin-Events-in-Offline-Mode.patch
View file

@ -1,4 +1,4 @@
From c948544e80b194dd53b68464dc3b120549323a40 Mon Sep 17 00:00:00 2001
From f028d32e2c3bdbdba4b9d8fedd470f3cfe095398 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

8
CraftBukkit-Patches/0055-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From b258124c6b30ae28bd727f320a39f80ad23e03a2 Mon Sep 17 00:00:00 2001
From 93067185017bb7bcd1f431b3fc5d466b2aff8515 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
@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
Provides support for IP forwarding via BungeeCord.
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index b34a59a..e5f1f7f 100644
index d0374d0..8a6ef45 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
@ -45,7 +45,7 @@ index b34a59a..e5f1f7f 100644
}
break;
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index b936fb3..98eac81 100644
index 1fa9626..541cec7 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -84,9 +84,24 @@ public class LoginListener implements PacketLoginInListener, IUpdatePlayerListBo
@ -144,7 +144,7 @@ index cc5aee0..18d0c6b 100644
this.d = EnumProtocol.a(packetdataserializer.e());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 7b2d8d1..7fead36 100644
index 665d58e..0dcf37e 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -403,7 +403,7 @@ public abstract class PlayerList {

2
CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch
View file

@ -1,4 +1,4 @@
From 11387329e86dce40ba8c4c7880c7634b5d52b28f Mon Sep 17 00:00:00 2001
From ef2d58c831e84ea077a99a67888aec302db80394 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

4
CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch
View file

@ -1,4 +1,4 @@
From 24af97a358f9850ec1f6ac4c1b44ac83d61db631 Mon Sep 17 00:00:00 2001
From be81b1a2a4b43c145bdaddbe15bff4f9121645f0 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 270d318..6c6f465 100644
index 054a269..b3d89c1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -63,7 +63,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

2
CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch
View file

@ -1,4 +1,4 @@
From 73905dd9c8dc0033a23ec2aec3bccffe86612863 Mon Sep 17 00:00:00 2001
From 8aee9e77f8557e093deb7e6632ecc4dd8627a4c9 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

4
CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch
View file

@ -1,11 +1,11 @@
From d5949a9c9b33d98719a85a290047bb5f9b4cbe52 Mon Sep 17 00:00:00 2001
From fc49ad64d8ae0dc5e4dfc2c5a00541dcb17431dc 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 6c6f465..c09a05e 100644
index b3d89c1..ab9bb09 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -550,6 +550,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

2
CraftBukkit-Patches/0060-Particle-API.patch
View file

@ -1,4 +1,4 @@
From cbae29782927717ec9ccde7e4f14a1fef9b983c5 Mon Sep 17 00:00:00 2001
From 02d65ac1109247f296b2e3d6dd33070c343fedc2 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

2
CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch
View file

@ -1,4 +1,4 @@
From c16e15a3678f6ca208cbde4d6630ec51a22528a6 Mon Sep 17 00:00:00 2001
From 7a845c3b5215c05f955a4a69511428b35bc245ec 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

2
CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch
View file

@ -1,4 +1,4 @@
From 8317a3fbd72cb6731287d8df185ff7a8938c16ce Mon Sep 17 00:00:00 2001
From 99507859014f932c1d4c637c3a02008d1bd70a18 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

2
CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View file

@ -1,4 +1,4 @@
From d69ad84a9b9497da1a7b45a6de8742a714bcb2c5 Mon Sep 17 00:00:00 2001
From 9a50d12977caba8b57ad46c3b22dcc7318ff7231 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's

2
CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch
View file

@ -1,4 +1,4 @@
From 50da834cc12577609c21d18eb8aba1940e1e8ec4 Mon Sep 17 00:00:00 2001
From 2d6caad78d93dcf69a495a49d774d24e2929730c 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

2
CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,4 +1,4 @@
From 2a802d0791cb9e2658807671a7d3092ab2fef28b Mon Sep 17 00:00:00 2001
From f5f64db9caf06e7acd5697cb5e01bc533cda1ac2 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

10
CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch
View file

@ -1,4 +1,4 @@
From a851c0d8d864636e9d4fbb63e28af2ed162a8675 Mon Sep 17 00:00:00 2001
From 93e9dc8adcc418a1a59183f2b42a7446977b96a3 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
@ -6,10 +6,10 @@ Subject: [PATCH] Add Late Bind Option
Add late-bind config option to delay binding until loading is done.
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 33b69c1..8b9c1ef 100644
index 7714dcb..def9dea 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -174,6 +174,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -173,6 +173,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.a(MinecraftEncryption.b());
DedicatedServer.LOGGER.info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.R());
@ -17,7 +17,7 @@ index 33b69c1..8b9c1ef 100644
try {
this.aq().a(inetaddress, this.R());
} catch (IOException ioexception) {
@@ -182,6 +183,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -181,6 +182,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
return false;
}
@ -25,7 +25,7 @@ index 33b69c1..8b9c1ef 100644
// Spigot Start - Move DedicatedPlayerList up and bring plugin loading from CraftServer to here
// this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit
@@ -271,6 +273,17 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -270,6 +272,17 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
// CraftBukkit end

4
CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch
View file

@ -1,11 +1,11 @@
From 85d94ac5966d8c8464ab51fe828013a4a23b4207 Mon Sep 17 00:00:00 2001
From b665d148f313bb73355a179f32960a9b65b6fa73 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
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
index 97c3e79..dc1dffb 100644
index 46845cd..22c2ffd 100644
--- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -31,6 +31,14 @@ public class ServerStatisticManager extends StatisticManager {

2
CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch
View file

@ -1,4 +1,4 @@
From 22f8c3151f8726503d2ec1b1b1c5e2b792d89526 Mon Sep 17 00:00:00 2001
From 184a2262511dd37ff81d4fbbdf9b8e33498ce7cc 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

4
CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch
View file

@ -1,11 +1,11 @@
From 8975b3c027edb2d69e9912526b57137f402edd0d Mon Sep 17 00:00:00 2001
From cdbd805f597fc3d83bbe2f17e0a86e370a5977cf 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 c09a05e..f331f41 100644
index ab9bb09..43ef181 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -745,7 +745,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

4
CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From 906b1664a3c1d0afafbf48e0f399389943eac0be Mon Sep 17 00:00:00 2001
From 010f2388c126b6770595d89ffd8694bad89c568b 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] Improve AutoSave Mechanism
@ -24,7 +24,7 @@ index 5208dbc..f8bfc2d 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f331f41..d34c4e9 100644
index 43ef181..7060622 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -657,7 +657,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

2
CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
View file

@ -1,4 +1,4 @@
From fa21783447705aa61405d57413882a1973c38907 Mon Sep 17 00:00:00 2001
From 18c096c98465377a05941c51d047a678f5dfc39b 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.

Some files were not shown because too many files have changed in this diff Show more