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

Update from upstream SpigotMC

Browse Source 
3beb7729816
a77ed5758a7
52c130fc6d9
This commit is contained in:
Zach Brown 2014-12-20 19:09:49 -06:00
parent 5460c17f8a
commit c7f1eed0bf
187 changed files with 251 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From 42e5c2b701d1668517704cdfe245760085e28c71 Mon Sep 17 00:00:00 2001
From e6075fce1256fa944083c6cde3b1e47fac360979 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 45e795c..5048996 100644
index f1efef0..7073202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,22 @@

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

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

2
Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch
View File

@ -1,4 +1,4 @@
From 35408cbfc22821fde7b03ef3b882586d594f63b1 Mon Sep 17 00:00:00 2001
From 11c6135ee84b7fa384873f93a2042c209fe8e708 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

2
Bukkit-Patches/0004-BungeeCord-Support.patch
View File

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

2
Bukkit-Patches/0005-Add-Arrow-API.patch
View File

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

2
Bukkit-Patches/0006-Add-Particle-API.patch
View File

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

2
Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
View File

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

2
Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch
View File

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

2
Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch
View File

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

2
Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch
View File

@ -1,4 +1,4 @@
From 9259c4a3c94e32c00f8caf68c3efcdcd75e2e962 Mon Sep 17 00:00:00 2001
From 04e44bad00eb86f4723436b1e8dcf377be1d3e87 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.

2
Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch
View File

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

2
Bukkit-Patches/0012-Player-Collision-API.patch
View File

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

2
Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch
View File

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

2
Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
View File

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

2
Bukkit-Patches/0015-Add-respawn-API.patch
View File

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

2
Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch
View File

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

2
Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch
View File

@ -1,4 +1,4 @@
From 8ec7365aa7fe168085927df79de3ed5edce1ff51 Mon Sep 17 00:00:00 2001
From 471ff3ec25981a3da53767a8fbfc3e1e19eadf4c 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

2
Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
View File

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

2
Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
View File

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

2
Bukkit-Patches/0020-Silenceable-Lightning-API.patch
View File

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

2
Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch
View File

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

2
Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
View File

@ -1,4 +1,4 @@
From b23657a0a81d18e8c99c670229fbd32012f0629d Mon Sep 17 00:00:00 2001
From 0f4a4c82fc37ed58ec00a3d1c359f9015b7fe939 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.

2
Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch
View File

@ -1,4 +1,4 @@
From 57096a321a825746d57c6086f6fe6e58d7c47b2b Mon Sep 17 00:00:00 2001
From 469503883eb7f346571db3061ff541a59e8d0ba8 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.

2
Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch
View File

@ -1,4 +1,4 @@
From 361c10f6aa8091bbc049d234da6943a7e714a3f5 Mon Sep 17 00:00:00 2001
From 4a69eee241ad670d823f4157fb9ce2071892f265 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.

2
Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch
View File

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

2
Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch
View File

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

2
Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch
View File

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

2
Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View File

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

4
Bukkit-Patches/0029-BungeeCord-Chat-API.patch
View File

@ -1,4 +1,4 @@
From 585d45507846245f38fcbd96c50d7d090ae04cd6 Mon Sep 17 00:00:00 2001
From 7b1c278c2600c9d0434f03ce82dca8038f2a68d8 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
@ -81,5 +81,5 @@ index b55d70e..8eb781e 100644
Spigot spigot();
--
1.9.4.msysgit.2
2.1.0

4
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 84cceb2127d9feeb2dbc3a7706be0ae5d58f7b64 Mon Sep 17 00:00:00 2001
From 2a9f9dbe39c385cdbf3becdee0cbe388015427d3 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
@ -121,5 +121,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
1.9.4.msysgit.2
2.1.0

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

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

2
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View File

@ -1,4 +1,4 @@
From 0f2279c57a405dc675881ee5941edd85de9bb30f Mon Sep 17 00:00:00 2001
From 6543ea640160f625e68be67db807d32ff47b7d27 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

2
CraftBukkit-Patches/0004-Obfuscation-Helpers.patch
View File

@ -1,4 +1,4 @@
From 2588e39beca5baaa8a95225e8005bb69437e906a Mon Sep 17 00:00:00 2001
From 14b6494829449183067239826ef42917bc293e0b 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

4
CraftBukkit-Patches/0005-Spigot-Configuration.patch
View File

@ -1,4 +1,4 @@
From 5a74d8939260f6782528b1a1cd4c2423122cdce6 Mon Sep 17 00:00:00 2001
From 61c6477329d330759663f728fcda40d96294f981 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
@ -55,7 +55,7 @@ index a8aeca1..b15988a 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7968b4b..9da97e5 100644
index 4c33f5a..51e4489 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,8 +246,10 @@ public final class CraftServer implements Server {

2
CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
View File

@ -1,4 +1,4 @@
From 6002be5a4ba3fbca9e904550bd99cfa29a06c256 Mon Sep 17 00:00:00 2001
From 09f7b5fa62a19b90ee09b80fec983922cfd01388 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

2
CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
View File

@ -1,4 +1,4 @@
From 39fa5aadc64064cbb6d8674624e05c076951d27a Mon Sep 17 00:00:00 2001
From 52222eafdefa08bdd3beffe3275b7e91656e1366 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

2
CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch
View File

@ -1,4 +1,4 @@
From 0c6626c35833657924083433faabd8d7279dce79 Mon Sep 17 00:00:00 2001
From c7a1c266931bc601635974cfec17f4b51c766600 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:09:45 +1000
Subject: [PATCH] More Efficient Chunk Save Queue

2
CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
View File

@ -1,4 +1,4 @@
From 0cafd6bbb5b8ad7562688b6dce8d1e64ac062d32 Mon Sep 17 00:00:00 2001
From 25c237591f775570916eaeb6fa7dec298e1e3974 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

4
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View File

@ -1,4 +1,4 @@
From 06a697947e18bc5bdfbe8a498d9ab320ae69bf13 Mon Sep 17 00:00:00 2001
From 2ae2ea254cbba63669fa3227bb1c638ed100e6ed 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
@ -122,7 +122,7 @@ index 486a828..a9ff641 100644
if (generate) {
// Use the default variant of loadChunk when generate == true.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e4d0e41..36469db 100644
index fed7b4d..9268686 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
CraftBukkit-Patches/0011-View-Distance.patch
View File

@ -1,4 +1,4 @@
From 2d77781735f24206efabc85b2686de7ffe8ee94b Mon Sep 17 00:00:00 2001
From 1134e06c56f1adcb857f827faede78912080d794 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
@ -22,7 +22,7 @@ index 8ac9387..5ca5935 100644
public WorldServer a() {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 93e5a14..f34b76e 100644
index 786a367..737b546 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -62,7 +62,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

2
CraftBukkit-Patches/0012-Spigot-Timings.patch
View File

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

2
CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View File

@ -1,4 +1,4 @@
From b9b5a6c0add6253d7f4d79849542708bf3bc18c0 Mon Sep 17 00:00:00 2001
From c8dd6cac7c41eaa7c7abc6fbf8aebe3e6b521ef7 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/0014-Handle-Null-Tile-Entities.patch
View File

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

15
CraftBukkit-Patches/0015-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From aec15dc9337123932c26d8a07f73209517a6a5c1 Mon Sep 17 00:00:00 2001
From 65adc99054ba4baa0c77b63e75de3b2698eecf90 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
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 59473f5..cffe530 100644
index 5441e8b..c4cf603 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -89,14 +89,14 @@ public abstract class Entity implements ICommandListener {
@ -37,7 +37,7 @@ index 59473f5..cffe530 100644
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
+ public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
+ public final boolean defaultActivationState;
+ public long activatedTick = 0;
+ public long activatedTick = Integer.MIN_VALUE;
+ public void inactiveTick() { }
+ // Spigot end
@ -57,7 +57,7 @@ index 59473f5..cffe530 100644
this.datawatcher = new DataWatcher(this);
this.datawatcher.a(0, Byte.valueOf((byte) 0));
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
index 3303d19..035d719 100644
index 2adcc19..23091bd 100644
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -9,6 +9,31 @@ public abstract class EntityAgeable extends EntityCreature {
@ -205,10 +205,10 @@ index 558574f..41d2d87 100644
public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
new file mode 100644
index 0000000..cfabc25
index 0000000..d3f4af1
--- /dev/null
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +1,283 @@
@@ -0,0 +1,284 @@
+package org.spigotmc;
+
+import java.util.ArrayList;
@ -455,7 +455,8 @@ index 0000000..cfabc25
+ public static boolean checkIfActive(Entity entity)
+ {
+ SpigotTimings.checkIfActiveTimer.startTiming();
+ if ( !entity.isAddedToChunk() ) {
+ // Never safe to skip fireworks or entities not yet added to chunk
+ if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks ) {
+ SpigotTimings.checkIfActiveTimer.stopTiming();
+ return true;
+ }

2
CraftBukkit-Patches/0016-Metrics.patch
View File

@ -1,4 +1,4 @@
From 4787b7b00753364412d162f25dfadbe1da207c55 Mon Sep 17 00:00:00 2001
From 157adb47225e6424cfb87238f8eb0e1527b9e8c3 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/0017-PlayerItemDamageEvent.patch
View File

@ -1,4 +1,4 @@
From 7c574b4c66f3561cbfc8cfab2d5e40c8d6a595e1 Mon Sep 17 00:00:00 2001
From 91ac812c8ff8d8c0cfd0815ce8fa1eef5b8bb6f2 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/0018-Prevent-NPE-in-CraftSign.patch
View File

@ -1,4 +1,4 @@
From 5bc259a6567c04944c072dd5866eb94606b34741 Mon Sep 17 00:00:00 2001
From 8fe0318e77d7eb652ca2f006df4120332decf800 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/0019-Entity-Tracking-Ranges.patch
View File

@ -1,4 +1,4 @@
From 255ca1791eb25f3ae3dc98a48cdebe11e6437c48 Mon Sep 17 00:00:00 2001
From f75db850b59b5aa64012b30beef90e5e92f0cd63 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/0020-Thread-Naming-and-Tweaks.patch
View File

@ -1,4 +1,4 @@
From 8fe787a19b0fd8fea847c4bec826f8be60af91a7 Mon Sep 17 00:00:00 2001
From d947cd0d45c4886112df610c3c98829fb39de691 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/0021-Close-Unloaded-Save-Files.patch
View File

@ -1,4 +1,4 @@
From 5130e3bfb747db131ecf214bffe52690dbb74132 Mon Sep 17 00:00:00 2001
From 9d32f66b46736cdb2ee51f6c7a2bac83c258fde4 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/0022-Remove-o-Option.patch
View File

@ -1,4 +1,4 @@
From 173a71adcf42c8dc373c9a2399eb4a0410915efc Mon Sep 17 00:00:00 2001
From e865f033efb5b764d32ddbef1f20f2e1dfc7d303 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/0023-Recipe-Deconstruction.patch
View File

@ -1,4 +1,4 @@
From e62dd23291bb93bbfa318a7fcb14265d515e77b9 Mon Sep 17 00:00:00 2001
From ba83b1f7a28a15a4ac097a48a52e24822b89afd6 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/0024-Implement-Arrow-API.patch
View File

@ -1,4 +1,4 @@
From 6f2d10b520824fb018ee8d27022b0e47f9fc5c4c Mon Sep 17 00:00:00 2001
From 50820e8d19ba6da303b7a57361f1f3a31662e9b2 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/0025-Hopper-Customisations.patch
View File

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

4
CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From fd45629acbd8663564bea3f190939d9e7754f033 Mon Sep 17 00:00:00 2001
From 3c33825d88469c5c9ba8e930ce959225ddd71801 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.
@ -63,7 +63,7 @@ index fe24b1f..ebcba7b 100644
return entity;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index cc1d371..982e45c 100644
index 391e5b9..96c7344 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -18,6 +18,7 @@ import org.bukkit.Statistic.Type;

2
CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch
View File

@ -1,4 +1,4 @@
From 6bf639a2025d60282de7a822ba0bf148f71dd59a Mon Sep 17 00:00:00 2001
From 5cbafc9141a291ea267bdecb1f83c895e6b4ef78 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/0028-Allow-Disabling-of-Command-Logging.patch
View File

@ -1,11 +1,11 @@
From ab0d44cd1966433c726535a9f23c1c20b4d3f08f Mon Sep 17 00:00:00 2001
From a80867a03656596ef9359d3c91c1660e09ae37af 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 d3530c9..848db10 100644
index 7863f9b..dd7b0c2 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1045,6 +1045,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

2
CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch
View File

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

4
CraftBukkit-Patches/0030-Configurable-Messages.patch
View File

@ -1,4 +1,4 @@
From 21d7a65e1639ca5ae704cdc6a1ad7b4424771f82 Mon Sep 17 00:00:00 2001
From b0f50352927b53382c679c05ae4c31b5db6aff50 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
@ -23,7 +23,7 @@ index f8bac48..e036bc6 100644
this.b.close(chatcomponenttext);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 5ca721b..f76709f 100644
index 6d8df63..fad41c2 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -379,7 +379,7 @@ public abstract class PlayerList {

2
CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@ -1,4 +1,4 @@
From 9c6aabd8fbd8d6299a986cb2dc4daada411d6f54 Mon Sep 17 00:00:00 2001
From 04adfc1b8e240bc913d03900406ba4d745a1dea7 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/0032-Properly-Close-Inventories.patch
View File

@ -1,4 +1,4 @@
From 86bf7d4be1de5bc6ede793017ce722684427e1ea Mon Sep 17 00:00:00 2001
From 1b9e109bcbc78ceb77bbee74f18fa82d01d2710f 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/0033-Disallow-Interaction-With-Self.patch
View File

@ -1,11 +1,11 @@
From edc3955277f82092b8c00b0dcd136f838971e666 Mon Sep 17 00:00:00 2001
From ce4ce90263be61f101193f1d3de7e37d9c627c38 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 848db10..1780f9a 100644
index dd7b0c2..65dd171 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1179,6 +1179,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

4
CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,11 +1,11 @@
From 898268b70af55725aab77f43d0f2a1fb809307aa Mon Sep 17 00:00:00 2001
From 3a064ce3b5c693ba2a718a188ae072176dcf838c 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
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 56f71f3..ce0c305 100644
index c4cf603..ad48ca8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1544,6 +1544,7 @@ public abstract class Entity implements ICommandListener {

4
CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch
View File

@ -1,4 +1,4 @@
From f8664946ba2853b3d8413cf9c6624f515655c48a Mon Sep 17 00:00:00 2001
From 6883d850edaa69cf6aee9617aca0064c48c46f0d 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 f76709f..3b6e4f0 100644
index fad41c2..b370b6d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -506,6 +506,11 @@ public abstract class PlayerList {

2
CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch
View File

@ -1,4 +1,4 @@
From 98ae2b148bb59c9af8619cfcf7f592864ca90645 Mon Sep 17 00:00:00 2001
From 6f633a55450073b31c4a3647f1094a41a2295837 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/0037-Player-Collision-API.patch
View File

@ -1,4 +1,4 @@
From 8e8e24f2157500392cf8ecd4df26986b730907ee Mon Sep 17 00:00:00 2001
From 5fbb44f7cf8920d0b54ab7f36c341ad454ef9475 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

2
CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch
View File

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

2
CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch
View File

@ -1,4 +1,4 @@
From 78d9aa55fcc0bc2b2184e739d98d161933be842d Mon Sep 17 00:00:00 2001
From eb1e769979d543a0ed9869a6574ae1376205eb81 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/0040-Cap-Minimum-Player-Speed.patch
View File

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

4
CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
View File

@ -1,11 +1,11 @@
From a4bdded45745aa87c3f5d1a358520da12c011ec8 Mon Sep 17 00:00:00 2001
From 72b9adcdbc960562097f32f4d8907255ef6923d4 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
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index ba2e9f9..cf1cf37 100644
index b65c225..eaa5879 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -300,6 +300,10 @@ public abstract class EntityHuman extends EntityLiving {

2
CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
View File

@ -1,4 +1,4 @@
From 17b8ffe2da66b3b20f4f94f1501b9b1fc074fef6 Mon Sep 17 00:00:00 2001
From 77f83517725bbe81f918b968045d2f319a7fea82 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/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch
View File

@ -1,4 +1,4 @@
From e24ed94388631dd27adbceae9f42beef808fee1f Mon Sep 17 00:00:00 2001
From fba2b9c4d38742aa9cd7402ffb3b050f2c687d4c 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/0044-Item-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From 7095785388e597a8ffd61ae0358bfcc0d6aa325b Mon Sep 17 00:00:00 2001
From 4fe1152e6cfc0f0b71e9fccf8e4d402811de484e 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/0045-Don-t-Special-Case-X-Move-Value.patch
View File

@ -1,11 +1,11 @@
From 75173a882cdd386dc4176a650a62557c642b77fc Mon Sep 17 00:00:00 2001
From 51b6f158ded3214ccf521aab307d58fac43d68e2 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 3b69996..8b32d1b 100644
index 65dd171..96e025d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -108,6 +108,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

2
CraftBukkit-Patches/0046-Implement-respawn-API.patch
View File

@ -1,4 +1,4 @@
From d54e960ee49e15b10bbd54010ab2f2ac8d04941b Mon Sep 17 00:00:00 2001
From d38cae7669c5499cba72b5cfd8c4b3503c1a3543 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/0047-Arrow-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From d10d9936aef229648a523a1b8ccba61ce4f4b9da Mon Sep 17 00:00:00 2001
From 6acacd657fbcbee0901193bea246574f1d7df832 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/0048-Fix-packed-ice-generation.patch
View File

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

4
CraftBukkit-Patches/0049-Watchdog-Thread.patch
View File

@ -1,4 +1,4 @@
From 9dc042d1bac57e22faacb6be61edbbc72f2aa168 Mon Sep 17 00:00:00 2001
From 67c65beda7c31aacc7459cc4d57f663d5d06a096 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.
@ -39,7 +39,7 @@ index 0619584..2fa1626 100644
}
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 0000000..429c2580
index 0000000..429c258
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,124 @@

2
CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch
View File

@ -1,4 +1,4 @@
From 28a5cdec41be4bb97141e21bfabf8e583e4a5970 Mon Sep 17 00:00:00 2001
From a956b3663faf45c0a04f66f7fdc3ca238eab76c3 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/0051-Fix-some-chunks-not-being-sent-to-the-client.patch
View File

@ -1,4 +1,4 @@
From b21eab777645a11ea1aa708457f8529cfa12fd87 Mon Sep 17 00:00:00 2001
From bade81a132af349e6b68ce2754a8819afdaa76b6 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/0052-Fix-Broken-Async-Chat.patch
View File

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

2
CraftBukkit-Patches/0053-Orebfuscator.patch
View File

@ -1,4 +1,4 @@
From ced28f845408949344664e37e3aaf48f0d4db66c Mon Sep 17 00:00:00 2001
From 8abc761a307c8805fc52e91e6fdaf284059f4d23 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/0054-Optimize-DataWatcher.patch
View File

@ -1,4 +1,4 @@
From f73f0d7454e1a19c501a2cca873fbc490afad9ef Mon Sep 17 00:00:00 2001
From 858ea79504049852f173a47a3cb420502d4caed3 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/0055-Fire-PreLogin-Events-in-Offline-Mode.patch
View File

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

2
CraftBukkit-Patches/0056-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 661d9a1d6d725387d016a63a85a67884ccf5c430 Mon Sep 17 00:00:00 2001
From 0a978b201ff62beb5d9bcb289959a7d4e6bbe531 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

4
CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch
View File

@ -1,4 +1,4 @@
From 7a2d55f11e40d55120d908d5eab00ce4a7768b42 Mon Sep 17 00:00:00 2001
From c1d2464f460ff920b89c94898169f39ca4eb7ed7 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
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression
Ability to configure if Zombies will be aggressive towards Villagers.
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 378ab11..d50ddd4 100644
index aa609ef..3e6a101 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -39,12 +39,12 @@ public class EntityZombie extends EntityMonster {

2
CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch
View File

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

2
CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch
View File

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

2
CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch
View File

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

17
CraftBukkit-Patches/0061-Particle-API.patch
View File

@ -1,4 +1,4 @@
From 5e3d4b590b7f29e7f161c14ba275b9a8f99ed426 Mon Sep 17 00:00:00 2001
From 71ef235ee356c1c2074c85720447540de1e368b4 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
@ -132,10 +132,21 @@ index 3b660ff..eeb1ecb 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2841e94..005d20f 100644
index 2841e94..ce16883 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1346,6 +1346,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -322,9 +322,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void playEffect(Location loc, Effect effect, int data) {
if (getHandle().playerConnection == null) return;
- int packetData = effect.getId();
- PacketPlayOutWorldEvent packet = new PacketPlayOutWorldEvent(packetData, new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()), data, false);
- getHandle().playerConnection.sendPacket(packet);
+ spigot().playEffect(loc, effect, data, 0, 0, 0, 0, 1, 1, Integer.MAX_VALUE);
}
@Override
@@ -1346,6 +1344,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}

4
CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch
View File

@ -1,11 +1,11 @@
From 5dd51c69a6882437a9c2ca661ee93e1f620be935 Mon Sep 17 00:00:00 2001
From b1463976068e165707ff3fe644b0b712f907fea7 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
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ce0c305..b1b9492 100644
index ad48ca8..4bf6713 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1198,6 +1198,7 @@ public abstract class Entity implements ICommandListener {

2
CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch
View File

@ -1,4 +1,4 @@
From 94b7d826fa4e104889820c8d444bf8ffe8b495cf Mon Sep 17 00:00:00 2001
From 11b56bc54102b09da6713360b917e944b4d177ea 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

6
CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View File

@ -1,17 +1,17 @@
From aa38b464f2fb0cb80f3258789626d34f52a5ad98 Mon Sep 17 00:00:00 2001
From 60d8cef46666b7df46b5b4c60007851b4150551f 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
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1755da2..fd7c615 100644
index 4bf6713..8537222 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -118,6 +118,7 @@ public abstract class Entity implements ICommandListener {
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
public long activatedTick = 0;
public long activatedTick = Integer.MIN_VALUE;
+ public boolean fromMobSpawner;
public void inactiveTick() { }
// Spigot end

2
CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch
View File

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

6
CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch
View File

@ -1,14 +1,14 @@
From 45eca0436f77e26d507009ad52307ed0519517d3 Mon Sep 17 00:00:00 2001
From 1026fb8a76d7f8fcdf4db7408d7db2cf625836fb 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
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 005d20f..c7eaca5 100644
index ce16883..6c10b1a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1243,7 +1243,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1241,7 +1241,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

2
CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch
View File

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

2
CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch
View File

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

2
CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch
View File

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

2
CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch
View File

@ -1,4 +1,4 @@
From 77dbbb73f38e8560a1b7eb2e7062738d206b8ee4 Mon Sep 17 00:00:00 2001
From 37111d2adbf8e163fbc5468dce5bc02ddf74d58c 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

2
CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch
View File

@ -1,4 +1,4 @@
From 8326bdd48e713856115000a07b0bb4cf12881e64 Mon Sep 17 00:00:00 2001
From 3d1a1a063bb073fe32197cd248e2c99a91e22c48 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

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