From 6ed812be081c527a8c6cd837e9bf07e32be06ac0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 08:37:28 +1100 Subject: [PATCH] Pop guard entity list patch to top --- ...eed.patch => 0050-Cap-Minimum-Player-Speed.patch} | 4 ++-- ...entory-and-Health-for-PlayerConsumeItemEve.patch} | 2 +- ...yChangeBlockEvent-for-Fire-Arrows-hitting-.patch} | 2 +- ...-Allow-Disabling-of-1.6.3-Structure-Saving.patch} | 4 ++-- ...spawn-Rate.patch => 0054-Item-Despawn-Rate.patch} | 4 ++-- ...ch => 0055-Don-t-Special-Case-X-Move-Value.patch} | 2 +- ...wn-API.patch => 0056-Implement-respawn-API.patch} | 4 ++-- ...057-Fix-BrewingStands-Removing-NBT-Potions.patch} | 2 +- ...pawn-Rate.patch => 0058-Arrow-Despawn-Rate.patch} | 6 +++--- ...chdog-Thread.patch => 0059-Watchdog-Thread.patch} | 4 ++-- ...on.patch => 0060-Fix-packed-ice-generation.patch} | 2 +- ...d-Support.patch => 0061-BungeeCord-Support.patch} | 4 ++-- ...rop.patch => 0062-Clear-Flower-Pot-on-Drop.patch} | 2 +- ...x-some-chunks-not-being-sent-to-the-client.patch} | 2 +- ...c-Chat.patch => 0064-Fix-Broken-Async-Chat.patch} | 2 +- ...w-Teleportation-of-Vehicles-and-Passengers.patch} | 4 ++-- ... 0066-Remove-OS-X-Special-Chars-from-Signs.patch} | 2 +- ...68-Orebfuscator.patch => 0067-Orebfuscator.patch} | 10 +++++----- ...Watcher.patch => 0068-Optimize-DataWatcher.patch} | 2 +- ...Allow-Disabling-Zombie-Villager-Aggression.patch} | 4 ++-- ... 0070-Configurable-Amount-of-Netty-Threads.patch} | 6 +++--- ...ing.patch => 0071-Prevent-Mineshaft-Saving.patch} | 2 +- ... 0072-Fire-PreLogin-Events-in-Offline-Mode.patch} | 4 ++-- ...=> 0073-Log-Cause-of-Unexpected-Exceptions.patch} | 4 ++-- ...75-Particle-API.patch => 0074-Particle-API.patch} | 4 ++-- ...patch => 0075-Fix-Biome-Decoration-Crashes.patch} | 4 ++-- ...g.patch => 0076-Save-ticks-lived-to-nbttag.patch} | 4 ++-- ...ubes.patch => 0077-More-Efficient-GetCubes.patch} | 8 ++++---- ...078-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch} | 6 +++--- ...> 0079-Warn-if-PermGen-may-be-insufficient.patch} | 4 ++-- ...0-Disable-Connected-Check-on-setScoreboard.patch} | 4 ++-- ...-Option.patch => 0081-Add-Late-Bind-Option.patch} | 4 ++-- ...date-Chest-Animation-when-Cancelling-Event.patch} | 4 ++-- ...ient-s-Hand-when-BlockPlaceEvent-Cancelled.patch} | 2 +- ...084-Allow-statistics-to-be-disabled-forced.patch} | 4 ++-- ...lisions.patch => 0085-Fix-anvil-collisions.patch} | 4 ++-- ...tch => 0086-Fix-ItemStack-Unbreakable-Code.patch} | 4 ++-- ... 0087-Try-and-Debug-Crash-Reports-Crashing.patch} | 4 ++-- ...m.patch => 0088-Replace-AutoSave-Mechanism.patch} | 4 ++-- ...89-Block-data-values-that-crash-the-client.patch} | 4 ++-- ...pport-vanilla-s-direction-tag-on-fireballs.patch} | 4 ++-- ...Ls.patch => 0091-Support-non-prefixed-URLs.patch} | 4 ++-- ...-stalling-on-corrupted-map-data-NBT-arrays.patch} | 4 ++-- ...=> 0093-Reduce-memory-of-hiddenPlayers-map.patch} | 4 ++-- ...ling-of-ZombiePigmen-spawning-in-portal-bl.patch} | 6 +++--- ...t-let-trees-replace-any-block-when-growing.patch} | 4 ++-- ...p.patch => 0096-Highly-Optimized-Tick-Loop.patch} | 2 +- ...pigot-Links.patch => 0097-Add-Spigot-Links.patch} | 2 +- ...atch => 0098-Configurable-Ping-Sample-Size.patch} | 4 ++-- ....patch => 0099-Add-Optional-Tick-Shuffling.patch} | 4 ++-- ...> 0100-Allow-Configuring-Chunks-per-Packet.patch} | 6 +++--- ...> 0101-Implement-Locale-Getter-for-Players.patch} | 4 ++-- ...isions.patch => 0102-Cap-Entity-Collisions.patch} | 6 +++--- ...sing-bone-meal-not-having-the-correct-data.patch} | 4 ++-- ...sions.patch => 0104-Spam-Filter-Exclusions.patch} | 2 +- ...Add-Option-to-Silence-CommandBlock-Console.patch} | 4 ++-- ...06-Add-support-for-fetching-hidden-players.patch} | 4 ++-- ... 0107-Allow-Disabling-Creative-Item-Filter.patch} | 2 +- ...ns.patch => 0108-Cap-Channel-Registrations.patch} | 4 ++-- ...lla-commands-to-be-the-main-version-of-a-c.patch} | 4 ++-- ...nalize-the-isDisconnected-method-by-bukkit.patch} | 2 +- ...> 0111-Implement-Silenceable-Lightning-API.patch} | 4 ++-- ...alize-spaces-on-when-reading-a-chat-packet.patch} | 4 ++-- ...one-PermissibleBase-for-all-Command-Blocks.patch} | 4 ++-- ...> 0114-Prevent-hoppers-from-loading-chunks.patch} | 4 ++-- ...ntity-list.patch => 0115-Guard-entity-list.patch} | 12 ++++++------ 66 files changed, 130 insertions(+), 130 deletions(-) rename CraftBukkit-Patches/{0051-Cap-Minimum-Player-Speed.patch => 0050-Cap-Minimum-Player-Speed.patch} (93%) rename CraftBukkit-Patches/{0052-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch => 0051-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch} (94%) rename CraftBukkit-Patches/{0053-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch => 0052-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch} (96%) rename CraftBukkit-Patches/{0054-Allow-Disabling-of-1.6.3-Structure-Saving.patch => 0053-Allow-Disabling-of-1.6.3-Structure-Saving.patch} (95%) rename CraftBukkit-Patches/{0055-Item-Despawn-Rate.patch => 0054-Item-Despawn-Rate.patch} (94%) rename CraftBukkit-Patches/{0056-Don-t-Special-Case-X-Move-Value.patch => 0055-Don-t-Special-Case-X-Move-Value.patch} (97%) rename CraftBukkit-Patches/{0057-Implement-respawn-API.patch => 0056-Implement-respawn-API.patch} (92%) rename CraftBukkit-Patches/{0058-Fix-BrewingStands-Removing-NBT-Potions.patch => 0057-Fix-BrewingStands-Removing-NBT-Potions.patch} (95%) rename CraftBukkit-Patches/{0059-Arrow-Despawn-Rate.patch => 0058-Arrow-Despawn-Rate.patch} (92%) rename CraftBukkit-Patches/{0060-Watchdog-Thread.patch => 0059-Watchdog-Thread.patch} (99%) rename CraftBukkit-Patches/{0061-Fix-packed-ice-generation.patch => 0060-Fix-packed-ice-generation.patch} (97%) rename CraftBukkit-Patches/{0062-BungeeCord-Support.patch => 0061-BungeeCord-Support.patch} (98%) rename CraftBukkit-Patches/{0063-Clear-Flower-Pot-on-Drop.patch => 0062-Clear-Flower-Pot-on-Drop.patch} (94%) rename CraftBukkit-Patches/{0064-Fix-some-chunks-not-being-sent-to-the-client.patch => 0063-Fix-some-chunks-not-being-sent-to-the-client.patch} (95%) rename CraftBukkit-Patches/{0065-Fix-Broken-Async-Chat.patch => 0064-Fix-Broken-Async-Chat.patch} (95%) rename CraftBukkit-Patches/{0066-Allow-Teleportation-of-Vehicles-and-Passengers.patch => 0065-Allow-Teleportation-of-Vehicles-and-Passengers.patch} (94%) rename CraftBukkit-Patches/{0067-Remove-OS-X-Special-Chars-from-Signs.patch => 0066-Remove-OS-X-Special-Chars-from-Signs.patch} (93%) rename CraftBukkit-Patches/{0068-Orebfuscator.patch => 0067-Orebfuscator.patch} (98%) rename CraftBukkit-Patches/{0069-Optimize-DataWatcher.patch => 0068-Optimize-DataWatcher.patch} (98%) rename CraftBukkit-Patches/{0070-Allow-Disabling-Zombie-Villager-Aggression.patch => 0069-Allow-Disabling-Zombie-Villager-Aggression.patch} (96%) rename CraftBukkit-Patches/{0071-Configurable-Amount-of-Netty-Threads.patch => 0070-Configurable-Amount-of-Netty-Threads.patch} (95%) rename CraftBukkit-Patches/{0072-Prevent-Mineshaft-Saving.patch => 0071-Prevent-Mineshaft-Saving.patch} (93%) rename CraftBukkit-Patches/{0073-Fire-PreLogin-Events-in-Offline-Mode.patch => 0072-Fire-PreLogin-Events-in-Offline-Mode.patch} (98%) rename CraftBukkit-Patches/{0074-Log-Cause-of-Unexpected-Exceptions.patch => 0073-Log-Cause-of-Unexpected-Exceptions.patch} (92%) rename CraftBukkit-Patches/{0075-Particle-API.patch => 0074-Particle-API.patch} (98%) rename CraftBukkit-Patches/{0076-Fix-Biome-Decoration-Crashes.patch => 0075-Fix-Biome-Decoration-Crashes.patch} (98%) rename CraftBukkit-Patches/{0077-Save-ticks-lived-to-nbttag.patch => 0076-Save-ticks-lived-to-nbttag.patch} (94%) rename CraftBukkit-Patches/{0078-More-Efficient-GetCubes.patch => 0077-More-Efficient-GetCubes.patch} (93%) rename CraftBukkit-Patches/{0079-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch => 0078-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch} (97%) rename CraftBukkit-Patches/{0080-Warn-if-PermGen-may-be-insufficient.patch => 0079-Warn-if-PermGen-may-be-insufficient.patch} (95%) rename CraftBukkit-Patches/{0081-Disable-Connected-Check-on-setScoreboard.patch => 0080-Disable-Connected-Check-on-setScoreboard.patch} (92%) rename CraftBukkit-Patches/{0082-Add-Late-Bind-Option.patch => 0081-Add-Late-Bind-Option.patch} (97%) rename CraftBukkit-Patches/{0083-Update-Chest-Animation-when-Cancelling-Event.patch => 0082-Update-Chest-Animation-when-Cancelling-Event.patch} (98%) rename CraftBukkit-Patches/{0084-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch => 0083-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch} (96%) rename CraftBukkit-Patches/{0085-Allow-statistics-to-be-disabled-forced.patch => 0084-Allow-statistics-to-be-disabled-forced.patch} (97%) rename CraftBukkit-Patches/{0086-Fix-anvil-collisions.patch => 0085-Fix-anvil-collisions.patch} (90%) rename CraftBukkit-Patches/{0087-Fix-ItemStack-Unbreakable-Code.patch => 0086-Fix-ItemStack-Unbreakable-Code.patch} (91%) rename CraftBukkit-Patches/{0088-Try-and-Debug-Crash-Reports-Crashing.patch => 0087-Try-and-Debug-Crash-Reports-Crashing.patch} (95%) rename CraftBukkit-Patches/{0089-Replace-AutoSave-Mechanism.patch => 0088-Replace-AutoSave-Mechanism.patch} (95%) rename CraftBukkit-Patches/{0090-Block-data-values-that-crash-the-client.patch => 0089-Block-data-values-that-crash-the-client.patch} (96%) rename CraftBukkit-Patches/{0091-Support-vanilla-s-direction-tag-on-fireballs.patch => 0090-Support-vanilla-s-direction-tag-on-fireballs.patch} (95%) rename CraftBukkit-Patches/{0092-Support-non-prefixed-URLs.patch => 0091-Support-non-prefixed-URLs.patch} (96%) rename CraftBukkit-Patches/{0093-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch => 0092-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch} (94%) rename CraftBukkit-Patches/{0094-Reduce-memory-of-hiddenPlayers-map.patch => 0093-Reduce-memory-of-hiddenPlayers-map.patch} (92%) rename CraftBukkit-Patches/{0095-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch => 0094-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch} (94%) rename CraftBukkit-Patches/{0096-Don-t-let-trees-replace-any-block-when-growing.patch => 0095-Don-t-let-trees-replace-any-block-when-growing.patch} (94%) rename CraftBukkit-Patches/{0097-Highly-Optimized-Tick-Loop.patch => 0096-Highly-Optimized-Tick-Loop.patch} (99%) rename CraftBukkit-Patches/{0098-Add-Spigot-Links.patch => 0097-Add-Spigot-Links.patch} (98%) rename CraftBukkit-Patches/{0099-Configurable-Ping-Sample-Size.patch => 0098-Configurable-Ping-Sample-Size.patch} (95%) rename CraftBukkit-Patches/{0100-Add-Optional-Tick-Shuffling.patch => 0099-Add-Optional-Tick-Shuffling.patch} (95%) rename CraftBukkit-Patches/{0101-Allow-Configuring-Chunks-per-Packet.patch => 0100-Allow-Configuring-Chunks-per-Packet.patch} (93%) rename CraftBukkit-Patches/{0102-Implement-Locale-Getter-for-Players.patch => 0101-Implement-Locale-Getter-for-Players.patch} (95%) rename CraftBukkit-Patches/{0103-Cap-Entity-Collisions.patch => 0102-Cap-Entity-Collisions.patch} (96%) rename CraftBukkit-Patches/{0104-Fix-dispensing-bone-meal-not-having-the-correct-data.patch => 0103-Fix-dispensing-bone-meal-not-having-the-correct-data.patch} (93%) rename CraftBukkit-Patches/{0105-Spam-Filter-Exclusions.patch => 0104-Spam-Filter-Exclusions.patch} (97%) rename CraftBukkit-Patches/{0106-Add-Option-to-Silence-CommandBlock-Console.patch => 0105-Add-Option-to-Silence-CommandBlock-Console.patch} (94%) rename CraftBukkit-Patches/{0107-Add-support-for-fetching-hidden-players.patch => 0106-Add-support-for-fetching-hidden-players.patch} (91%) rename CraftBukkit-Patches/{0108-Allow-Disabling-Creative-Item-Filter.patch => 0107-Allow-Disabling-Creative-Item-Filter.patch} (96%) rename CraftBukkit-Patches/{0109-Cap-Channel-Registrations.patch => 0108-Cap-Channel-Registrations.patch} (91%) rename CraftBukkit-Patches/{0110-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch => 0109-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch} (99%) rename CraftBukkit-Patches/{0111-Unfinalize-the-isDisconnected-method-by-bukkit.patch => 0110-Unfinalize-the-isDisconnected-method-by-bukkit.patch} (93%) rename CraftBukkit-Patches/{0112-Implement-Silenceable-Lightning-API.patch => 0111-Implement-Silenceable-Lightning-API.patch} (97%) rename CraftBukkit-Patches/{0113-Normalize-spaces-on-when-reading-a-chat-packet.patch => 0112-Normalize-spaces-on-when-reading-a-chat-packet.patch} (95%) rename CraftBukkit-Patches/{0114-Use-one-PermissibleBase-for-all-Command-Blocks.patch => 0113-Use-one-PermissibleBase-for-all-Command-Blocks.patch} (94%) rename CraftBukkit-Patches/{0115-Prevent-hoppers-from-loading-chunks.patch => 0114-Prevent-hoppers-from-loading-chunks.patch} (91%) rename CraftBukkit-Patches/{0050-Guard-entity-list.patch => 0115-Guard-entity-list.patch} (90%) diff --git a/CraftBukkit-Patches/0051-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0050-Cap-Minimum-Player-Speed.patch similarity index 93% rename from CraftBukkit-Patches/0051-Cap-Minimum-Player-Speed.patch rename to CraftBukkit-Patches/0050-Cap-Minimum-Player-Speed.patch index b6d2951a0..4f888a18b 100644 --- a/CraftBukkit-Patches/0051-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0050-Cap-Minimum-Player-Speed.patch @@ -1,4 +1,4 @@ -From 8407525d0a9e0efb1230c43265b094680677cac4 Mon Sep 17 00:00:00 2001 +From ca506b151bc56955adad102c6d1bd0d7ab9adc3c Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 5 Aug 2013 20:17:20 +1000 Subject: [PATCH] Cap Minimum Player Speed @@ -27,5 +27,5 @@ index afbc3d8..2a13ab2 100644 } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0052-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0051-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch similarity index 94% rename from CraftBukkit-Patches/0052-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch rename to CraftBukkit-Patches/0051-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch index 1f7764832..cbd5b6e4f 100644 --- a/CraftBukkit-Patches/0052-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch +++ b/CraftBukkit-Patches/0051-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch @@ -1,4 +1,4 @@ -From e4d29a379dcd02ff709d16a3653384c073777c61 Mon Sep 17 00:00:00 2001 +From 023511a96c130a73fa0bbf06394510977d626f31 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 14 Sep 2013 10:16:38 +1000 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent diff --git a/CraftBukkit-Patches/0053-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0052-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch similarity index 96% rename from CraftBukkit-Patches/0053-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch rename to CraftBukkit-Patches/0052-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index fc2330b2c..410398eb7 100644 --- a/CraftBukkit-Patches/0053-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0052-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From b4f4baa3a9363df73cb286e81e05a3fd2e5892d2 Mon Sep 17 00:00:00 2001 +From a1a4be40548d338d08bca93ac5baabdb1d02c657 Mon Sep 17 00:00:00 2001 From: BlackHole Date: Tue, 16 Jul 2013 22:34:50 +0200 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT diff --git a/CraftBukkit-Patches/0054-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0053-Allow-Disabling-of-1.6.3-Structure-Saving.patch similarity index 95% rename from CraftBukkit-Patches/0054-Allow-Disabling-of-1.6.3-Structure-Saving.patch rename to CraftBukkit-Patches/0053-Allow-Disabling-of-1.6.3-Structure-Saving.patch index 22aa53521..d68b479c3 100644 --- a/CraftBukkit-Patches/0054-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0053-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From 8a5b1d5de7ba483d44719957ec566895949f6d4d Mon Sep 17 00:00:00 2001 +From 06d62caeded766646822c23ff318825cabf570d9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 21 Sep 2013 12:33:09 +1000 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving @@ -25,7 +25,7 @@ index 1eb87ae..b3c8101 100644 this.e = new PersistentStructure(this.a()); world.a(this.a(), (PersistentBase) this.e); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index aa639fe..3825bdf 100644 +index adebd03..9586c44 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -184,4 +184,16 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0055-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0054-Item-Despawn-Rate.patch similarity index 94% rename from CraftBukkit-Patches/0055-Item-Despawn-Rate.patch rename to CraftBukkit-Patches/0054-Item-Despawn-Rate.patch index 0129b0f79..1a4679e74 100644 --- a/CraftBukkit-Patches/0055-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0054-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From e390045e8083aa77ebb244ed0cca6b40152acd7f Mon Sep 17 00:00:00 2001 +From c15a3f4eace7c5a135261ae3a7376b3457c0b9c4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Sep 2013 19:10:53 +1000 Subject: [PATCH] Item Despawn Rate @@ -18,7 +18,7 @@ index 08b9ac8..8ea7abc 100644 if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) { this.age = 0; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 3825bdf..72aabff 100644 +index 9586c44..82d59e7 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -196,4 +196,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0056-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0055-Don-t-Special-Case-X-Move-Value.patch similarity index 97% rename from CraftBukkit-Patches/0056-Don-t-Special-Case-X-Move-Value.patch rename to CraftBukkit-Patches/0055-Don-t-Special-Case-X-Move-Value.patch index 2b73da791..f7ae38e51 100644 --- a/CraftBukkit-Patches/0056-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0055-Don-t-Special-Case-X-Move-Value.patch @@ -1,4 +1,4 @@ -From 0afa39732c99413db7ac202857278521cfad9204 Mon Sep 17 00:00:00 2001 +From 61a71a37075b971328594cf0f631ff2b1121c701 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 6 Oct 2013 17:36:28 +1100 Subject: [PATCH] Don't Special Case X Move Value diff --git a/CraftBukkit-Patches/0057-Implement-respawn-API.patch b/CraftBukkit-Patches/0056-Implement-respawn-API.patch similarity index 92% rename from CraftBukkit-Patches/0057-Implement-respawn-API.patch rename to CraftBukkit-Patches/0056-Implement-respawn-API.patch index adc21d99e..ef66e6ec2 100644 --- a/CraftBukkit-Patches/0057-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0056-Implement-respawn-API.patch @@ -1,4 +1,4 @@ -From c6b2a59a9e9e424ab2e9a61ebbb2bd2779a29e23 Mon Sep 17 00:00:00 2001 +From b56774788efee419e1cf84cbefd7bae231f282cf Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:34:49 +0200 Subject: [PATCH] Implement respawn API. @@ -25,5 +25,5 @@ index 2a13ab2..1b902b2 100644 public Player.Spigot spigot() -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0058-Fix-BrewingStands-Removing-NBT-Potions.patch b/CraftBukkit-Patches/0057-Fix-BrewingStands-Removing-NBT-Potions.patch similarity index 95% rename from CraftBukkit-Patches/0058-Fix-BrewingStands-Removing-NBT-Potions.patch rename to CraftBukkit-Patches/0057-Fix-BrewingStands-Removing-NBT-Potions.patch index d0e491ddc..578491981 100644 --- a/CraftBukkit-Patches/0058-Fix-BrewingStands-Removing-NBT-Potions.patch +++ b/CraftBukkit-Patches/0057-Fix-BrewingStands-Removing-NBT-Potions.patch @@ -1,4 +1,4 @@ -From d2edd0b7da57c445ebf29d8ca8f3e0080a91a1c4 Mon Sep 17 00:00:00 2001 +From b6711003ac373b5b5ee7cdec63ab7a9b916c7ee9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 9 Oct 2013 18:20:05 +1100 Subject: [PATCH] Fix BrewingStands Removing NBT / Potions diff --git a/CraftBukkit-Patches/0059-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0058-Arrow-Despawn-Rate.patch similarity index 92% rename from CraftBukkit-Patches/0059-Arrow-Despawn-Rate.patch rename to CraftBukkit-Patches/0058-Arrow-Despawn-Rate.patch index 7c96939cb..2badd36b0 100644 --- a/CraftBukkit-Patches/0059-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0058-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 0f546eff1ddbd59635860defa0669ee356214fd7 Mon Sep 17 00:00:00 2001 +From 94773d2fd7022d2caff184295226da54f49b2d87 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Oct 2013 19:20:10 +1100 Subject: [PATCH] Arrow Despawn Rate @@ -18,7 +18,7 @@ index 367bcc9..7c9780a 100644 } } else { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 72aabff..d4e8bf4 100644 +index 82d59e7..2ec047c 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -203,4 +203,11 @@ public class SpigotWorldConfig @@ -34,5 +34,5 @@ index 72aabff..d4e8bf4 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0060-Watchdog-Thread.patch b/CraftBukkit-Patches/0059-Watchdog-Thread.patch similarity index 99% rename from CraftBukkit-Patches/0060-Watchdog-Thread.patch rename to CraftBukkit-Patches/0059-Watchdog-Thread.patch index c822c7930..2aa57f62b 100644 --- a/CraftBukkit-Patches/0060-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0059-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From c746e94351236fc5cc57da30acf90fced3e22fa8 Mon Sep 17 00:00:00 2001 +From ec2a118f17e4ce32df51bd0cace349dd6a0959c1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. @@ -144,7 +144,7 @@ index 0000000..a8840c9 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 8b7c73e..4152452 100644 +index 0ab2ec3..2ea1be7 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -167,4 +167,18 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0061-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0060-Fix-packed-ice-generation.patch similarity index 97% rename from CraftBukkit-Patches/0061-Fix-packed-ice-generation.patch rename to CraftBukkit-Patches/0060-Fix-packed-ice-generation.patch index 1b5687f2b..8a9fc870b 100644 --- a/CraftBukkit-Patches/0061-Fix-packed-ice-generation.patch +++ b/CraftBukkit-Patches/0060-Fix-packed-ice-generation.patch @@ -1,4 +1,4 @@ -From 1d3cc423d0fee923d1bad2d16850998a45789c0e Mon Sep 17 00:00:00 2001 +From 103ca4fa5be48fcb72a502fc66410e7e6687692b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 17:52:14 +1100 Subject: [PATCH] Fix packed ice generation diff --git a/CraftBukkit-Patches/0062-BungeeCord-Support.patch b/CraftBukkit-Patches/0061-BungeeCord-Support.patch similarity index 98% rename from CraftBukkit-Patches/0062-BungeeCord-Support.patch rename to CraftBukkit-Patches/0061-BungeeCord-Support.patch index 6a72c89bf..0ea151087 100644 --- a/CraftBukkit-Patches/0062-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0061-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 15c5a59473436856080f7fa581726e9c53666a4a Mon Sep 17 00:00:00 2001 +From a4c12731c51e49d0afe96527641b6cbedfec3c4f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -118,5 +118,5 @@ index 2ea1be7..08bd5ba 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0063-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0062-Clear-Flower-Pot-on-Drop.patch similarity index 94% rename from CraftBukkit-Patches/0063-Clear-Flower-Pot-on-Drop.patch rename to CraftBukkit-Patches/0062-Clear-Flower-Pot-on-Drop.patch index a9637e8c1..083bff160 100644 --- a/CraftBukkit-Patches/0063-Clear-Flower-Pot-on-Drop.patch +++ b/CraftBukkit-Patches/0062-Clear-Flower-Pot-on-Drop.patch @@ -1,4 +1,4 @@ -From 285ad18b80430718372d92b11d3169dc3c03441c Mon Sep 17 00:00:00 2001 +From 8ab30d44d9bfec8eae7b25b0a5fcaeb770379963 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 3 Dec 2013 11:07:48 +1100 Subject: [PATCH] Clear Flower Pot on Drop diff --git a/CraftBukkit-Patches/0064-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0063-Fix-some-chunks-not-being-sent-to-the-client.patch similarity index 95% rename from CraftBukkit-Patches/0064-Fix-some-chunks-not-being-sent-to-the-client.patch rename to CraftBukkit-Patches/0063-Fix-some-chunks-not-being-sent-to-the-client.patch index 71e6c7aa7..e561bb6b1 100644 --- a/CraftBukkit-Patches/0064-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0063-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,4 +1,4 @@ -From a23358ddd9ae5dccad3fbf6a16c93990987c19cb Mon Sep 17 00:00:00 2001 +From b9cea6e2f42b691f8491c09a08fcf9c774635ef7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 2 Dec 2013 23:42:09 +0000 Subject: [PATCH] Fix some chunks not being sent to the client diff --git a/CraftBukkit-Patches/0065-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0064-Fix-Broken-Async-Chat.patch similarity index 95% rename from CraftBukkit-Patches/0065-Fix-Broken-Async-Chat.patch rename to CraftBukkit-Patches/0064-Fix-Broken-Async-Chat.patch index 206df65ae..b8436ae82 100644 --- a/CraftBukkit-Patches/0065-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0064-Fix-Broken-Async-Chat.patch @@ -1,4 +1,4 @@ -From 5efbb67b37199034112875440a9e250448177f25 Mon Sep 17 00:00:00 2001 +From 648d8b6c10ec5b1c33a541c816b07b2e5b603305 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 5 Dec 2013 13:55:53 +1100 Subject: [PATCH] Fix Broken Async Chat diff --git a/CraftBukkit-Patches/0066-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0065-Allow-Teleportation-of-Vehicles-and-Passengers.patch similarity index 94% rename from CraftBukkit-Patches/0066-Allow-Teleportation-of-Vehicles-and-Passengers.patch rename to CraftBukkit-Patches/0065-Allow-Teleportation-of-Vehicles-and-Passengers.patch index dd0c2de60..3cdc7cdd8 100644 --- a/CraftBukkit-Patches/0066-Allow-Teleportation-of-Vehicles-and-Passengers.patch +++ b/CraftBukkit-Patches/0065-Allow-Teleportation-of-Vehicles-and-Passengers.patch @@ -1,4 +1,4 @@ -From 6cf9098868312d0b36d20b135d228292e9fa7ced Mon Sep 17 00:00:00 2001 +From e33b3e0cb1f5ce71cf6dd43dcb7a2a0f758a9da2 Mon Sep 17 00:00:00 2001 From: ItsHarry Date: Thu, 5 Dec 2013 21:58:11 +0100 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers @@ -36,5 +36,5 @@ index a85b08e..5fe8276 100644 // Update the From Location from = event.getFrom(); -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0067-Remove-OS-X-Special-Chars-from-Signs.patch b/CraftBukkit-Patches/0066-Remove-OS-X-Special-Chars-from-Signs.patch similarity index 93% rename from CraftBukkit-Patches/0067-Remove-OS-X-Special-Chars-from-Signs.patch rename to CraftBukkit-Patches/0066-Remove-OS-X-Special-Chars-from-Signs.patch index b6379d2f8..2a6489960 100644 --- a/CraftBukkit-Patches/0067-Remove-OS-X-Special-Chars-from-Signs.patch +++ b/CraftBukkit-Patches/0066-Remove-OS-X-Special-Chars-from-Signs.patch @@ -1,4 +1,4 @@ -From 484ad198db7915314a71b20265b34676a1685a01 Mon Sep 17 00:00:00 2001 +From e41b2df18579b4aa145f12479bf207401015fd65 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 8 Dec 2013 16:52:42 +1100 Subject: [PATCH] Remove OS X Special Chars from Signs diff --git a/CraftBukkit-Patches/0068-Orebfuscator.patch b/CraftBukkit-Patches/0067-Orebfuscator.patch similarity index 98% rename from CraftBukkit-Patches/0068-Orebfuscator.patch rename to CraftBukkit-Patches/0067-Orebfuscator.patch index cacef428c..7b91ad339 100644 --- a/CraftBukkit-Patches/0068-Orebfuscator.patch +++ b/CraftBukkit-Patches/0067-Orebfuscator.patch @@ -1,4 +1,4 @@ -From dd8fba0627e568fbfc40eefb307583ccf28864e4 Mon Sep 17 00:00:00 2001 +From bfe158f462416d4f219898dd85f8c429da7f65ae Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -115,10 +115,10 @@ index bceba7b..c963fac 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5b0875d..1aca7f6 100644 +index 5fb3fbf..3f47a76 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -490,6 +490,7 @@ public abstract class World implements IBlockAccess { +@@ -471,6 +471,7 @@ public abstract class World implements IBlockAccess { this.e(i, j + 1, k, block); this.e(i, j, k - 1, block); this.e(i, j, k + 1, block); @@ -335,7 +335,7 @@ index 0000000..3853903 + } +} diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index d4e8bf4..b9399ad 100644 +index 2ec047c..2c0501d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -1,5 +1,6 @@ @@ -383,5 +383,5 @@ index d4e8bf4..b9399ad 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0069-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0068-Optimize-DataWatcher.patch similarity index 98% rename from CraftBukkit-Patches/0069-Optimize-DataWatcher.patch rename to CraftBukkit-Patches/0068-Optimize-DataWatcher.patch index 4abfc2db4..7e839d1f0 100644 --- a/CraftBukkit-Patches/0069-Optimize-DataWatcher.patch +++ b/CraftBukkit-Patches/0068-Optimize-DataWatcher.patch @@ -1,4 +1,4 @@ -From 97a4d307554c92c124c5c29167ff5cd83cbb385a Mon Sep 17 00:00:00 2001 +From 3793df9b948b83bb5a2f238d505c1e2cd2e0931f Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:45:47 +1100 Subject: [PATCH] Optimize DataWatcher diff --git a/CraftBukkit-Patches/0070-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch similarity index 96% rename from CraftBukkit-Patches/0070-Allow-Disabling-Zombie-Villager-Aggression.patch rename to CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch index 85c72462a..daff423f3 100644 --- a/CraftBukkit-Patches/0070-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From 2868183681ae3cda43117854763c2d2407266234 Mon Sep 17 00:00:00 2001 +From f932d5f1e5e58cc6f31e506adb63ef36d768f5ef Mon Sep 17 00:00:00 2001 From: Dylan Xaldin Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression @@ -28,7 +28,7 @@ index 6c6e03e..5c8b0a8 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index b9399ad..e7cb99d 100644 +index 2c0501d..042280d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -243,4 +243,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0071-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch similarity index 95% rename from CraftBukkit-Patches/0071-Configurable-Amount-of-Netty-Threads.patch rename to CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch index 594e26957..a904a21ee 100644 --- a/CraftBukkit-Patches/0071-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From 7ea36e2d301483a4351362cf6aba8704ef406a01 Mon Sep 17 00:00:00 2001 +From b585df77e43d2b2a1f028413712cf26cdc8c9c1b Mon Sep 17 00:00:00 2001 From: md_5 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 839c2b1..b59a6d8 100644 +index 1e83999..94da13d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -51,7 +51,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -37,7 +37,7 @@ index 839c2b1..b59a6d8 100644 public boolean ai() { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index a43c373..19f2822 100644 +index 08bd5ba..cfddd28 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -191,4 +191,11 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0072-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch similarity index 93% rename from CraftBukkit-Patches/0072-Prevent-Mineshaft-Saving.patch rename to CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch index a00a991d5..a31de7f25 100644 --- a/CraftBukkit-Patches/0072-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From 1044478f8b2dc088f39c504c3b61cb35e2dc356d Mon Sep 17 00:00:00 2001 +From e668a30b0da6adabfa3d07b84f65be46787cf907 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 15:21:02 +1100 Subject: [PATCH] Prevent Mineshaft Saving diff --git a/CraftBukkit-Patches/0073-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0072-Fire-PreLogin-Events-in-Offline-Mode.patch similarity index 98% rename from CraftBukkit-Patches/0073-Fire-PreLogin-Events-in-Offline-Mode.patch rename to CraftBukkit-Patches/0072-Fire-PreLogin-Events-in-Offline-Mode.patch index c79c3f466..84ce75cef 100644 --- a/CraftBukkit-Patches/0073-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0072-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From 04aec6373875a2a3693d072f4f456a359b05a22c Mon Sep 17 00:00:00 2001 +From 5115b71622f08daea95e2b72b5d887555473311f Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:32:10 +1100 Subject: [PATCH] Fire PreLogin Events in Offline Mode @@ -126,5 +126,5 @@ index cc96775..ea8c269 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0074-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0073-Log-Cause-of-Unexpected-Exceptions.patch similarity index 92% rename from CraftBukkit-Patches/0074-Log-Cause-of-Unexpected-Exceptions.patch rename to CraftBukkit-Patches/0073-Log-Cause-of-Unexpected-Exceptions.patch index 69d992c26..4bc728451 100644 --- a/CraftBukkit-Patches/0074-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0073-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,4 +1,4 @@ -From ed994e973f6453e5e7b150941723e2a7a4ae27c7 Mon Sep 17 00:00:00 2001 +From b2b26307847cefe4478cfe0602055b76bba1b0f2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:39:14 +1100 Subject: [PATCH] Log Cause of Unexpected Exceptions @@ -22,5 +22,5 @@ index 94da13d..3f04557 100644 if (throwable instanceof ReportedException) { -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0075-Particle-API.patch b/CraftBukkit-Patches/0074-Particle-API.patch similarity index 98% rename from CraftBukkit-Patches/0075-Particle-API.patch rename to CraftBukkit-Patches/0074-Particle-API.patch index 70a972d3c..1ef73bcaf 100644 --- a/CraftBukkit-Patches/0075-Particle-API.patch +++ b/CraftBukkit-Patches/0074-Particle-API.patch @@ -1,4 +1,4 @@ -From 472f7020fe402c91523264825743ed0e6a7b1961 Mon Sep 17 00:00:00 2001 +From 44f030b59070ec828f921bc4d998ef481dc370af Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -117,5 +117,5 @@ index 57dd4e7..948e81d 100644 public Spigot spigot() -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0076-Fix-Biome-Decoration-Crashes.patch b/CraftBukkit-Patches/0075-Fix-Biome-Decoration-Crashes.patch similarity index 98% rename from CraftBukkit-Patches/0076-Fix-Biome-Decoration-Crashes.patch rename to CraftBukkit-Patches/0075-Fix-Biome-Decoration-Crashes.patch index 46379bc5a..88096c974 100644 --- a/CraftBukkit-Patches/0076-Fix-Biome-Decoration-Crashes.patch +++ b/CraftBukkit-Patches/0075-Fix-Biome-Decoration-Crashes.patch @@ -1,4 +1,4 @@ -From 00fe2f82e2a66288e7b8ce82e00eca55a43acf05 Mon Sep 17 00:00:00 2001 +From ceeaf943fe37285b19b65c8eaff5aab40631641a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 5 Jan 2014 09:35:01 +1100 Subject: [PATCH] Fix Biome Decoration Crashes @@ -107,5 +107,5 @@ index b048d6c..962d719 100644 + // Spigot End } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0077-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0076-Save-ticks-lived-to-nbttag.patch similarity index 94% rename from CraftBukkit-Patches/0077-Save-ticks-lived-to-nbttag.patch rename to CraftBukkit-Patches/0076-Save-ticks-lived-to-nbttag.patch index 35f70241f..b72a1af2d 100644 --- a/CraftBukkit-Patches/0077-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0076-Save-ticks-lived-to-nbttag.patch @@ -1,4 +1,4 @@ -From 86cde1d0ab89b153add30664042d11898a701ee1 Mon Sep 17 00:00:00 2001 +From 58cefc1fa88165c581765d8b8f7d7e3268c7fd66 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Tue, 9 Jul 2013 00:11:12 +0200 Subject: [PATCH] Save ticks lived to nbttag @@ -26,5 +26,5 @@ index d8d5739..5826b50 100644 if (entity instanceof EntityTameableAnimal && !isLevelAtLeast(nbttagcompound, 2) && !nbttagcompound.getBoolean("PersistenceRequired")) { EntityInsentient entityinsentient = (EntityInsentient) entity; -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0078-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0077-More-Efficient-GetCubes.patch similarity index 93% rename from CraftBukkit-Patches/0078-More-Efficient-GetCubes.patch rename to CraftBukkit-Patches/0077-More-Efficient-GetCubes.patch index eb6fbc78a..9982436ec 100644 --- a/CraftBukkit-Patches/0078-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0077-More-Efficient-GetCubes.patch @@ -1,14 +1,14 @@ -From 069a3c883232a653eca82fbdf2edd807f8bfea05 Mon Sep 17 00:00:00 2001 +From f549d9805fcb509d54023a01a7941a98e3ba0341 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:17:37 +1000 Subject: [PATCH] More Efficient GetCubes diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 026db15..9bc4256 100644 +index 3f47a76..6ec7f5a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1077,23 +1077,42 @@ public abstract class World implements IBlockAccess { +@@ -1053,23 +1053,42 @@ public abstract class World implements IBlockAccess { int i1 = MathHelper.floor(axisalignedbb.c); int j1 = MathHelper.floor(axisalignedbb.f + 1.0D); @@ -64,5 +64,5 @@ index 026db15..9bc4256 100644 double d0 = 0.25D; List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0)); -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0079-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0078-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch similarity index 97% rename from CraftBukkit-Patches/0079-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch rename to CraftBukkit-Patches/0078-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index 880b04d17..5f2ebd49e 100644 --- a/CraftBukkit-Patches/0079-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0078-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From 0ec77cb57bcc3c8d6737d50fea8ba570636bda8c Mon Sep 17 00:00:00 2001 +From 90fe95aadd4ad3961101b943dfc955039c010a6d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's @@ -64,7 +64,7 @@ index bb6b3d5..20d9094 100644 // CraftBukkit end } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index e7cb99d..018ec18 100644 +index 042280d..558e9cd 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -250,4 +250,11 @@ public class SpigotWorldConfig @@ -80,5 +80,5 @@ index e7cb99d..018ec18 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0080-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0079-Warn-if-PermGen-may-be-insufficient.patch similarity index 95% rename from CraftBukkit-Patches/0080-Warn-if-PermGen-may-be-insufficient.patch rename to CraftBukkit-Patches/0079-Warn-if-PermGen-may-be-insufficient.patch index ea740d917..2eeb6867d 100644 --- a/CraftBukkit-Patches/0080-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0079-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From b5692baac431c0b3aba6a4fdcd3f32ea93b6c6cf Mon Sep 17 00:00:00 2001 +From 5afdc54b428994b2b885b06d9bde72756f672483 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 14:07:41 +1100 Subject: [PATCH] Warn if PermGen may be insufficient @@ -32,5 +32,5 @@ index 8d127fb..062dbec 100644 MinecraftServer.main(options); } catch (Throwable t) { -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0081-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0080-Disable-Connected-Check-on-setScoreboard.patch similarity index 92% rename from CraftBukkit-Patches/0081-Disable-Connected-Check-on-setScoreboard.patch rename to CraftBukkit-Patches/0080-Disable-Connected-Check-on-setScoreboard.patch index 88558e206..a7621e0a8 100644 --- a/CraftBukkit-Patches/0081-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0080-Disable-Connected-Check-on-setScoreboard.patch @@ -1,4 +1,4 @@ -From 7ffe1f770f529b7bf3278d25af509d1ab91f21be Mon Sep 17 00:00:00 2001 +From ed7dc385966785531e2cee4494e15f208858f9bd Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 15:57:57 +1100 Subject: [PATCH] Disable Connected Check on setScoreboard @@ -18,5 +18,5 @@ index 5fe8276..0e8fedf 100644 this.server.getScoreboardManager().setPlayerBoard(this, scoreboard); -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0082-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0081-Add-Late-Bind-Option.patch similarity index 97% rename from CraftBukkit-Patches/0082-Add-Late-Bind-Option.patch rename to CraftBukkit-Patches/0081-Add-Late-Bind-Option.patch index 97bfef0e8..286db73b5 100644 --- a/CraftBukkit-Patches/0082-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0081-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From e16c36c3db4e4483dc97a9f6016e678c3a765e38 Mon Sep 17 00:00:00 2001 +From 354bcc1ce8bb0c6d613c176394a43d8172c9a1a0 Mon Sep 17 00:00:00 2001 From: slide23 Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option @@ -68,5 +68,5 @@ index cfddd28..69306cb 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0083-Update-Chest-Animation-when-Cancelling-Event.patch b/CraftBukkit-Patches/0082-Update-Chest-Animation-when-Cancelling-Event.patch similarity index 98% rename from CraftBukkit-Patches/0083-Update-Chest-Animation-when-Cancelling-Event.patch rename to CraftBukkit-Patches/0082-Update-Chest-Animation-when-Cancelling-Event.patch index f3eef17dd..ab825df9b 100644 --- a/CraftBukkit-Patches/0083-Update-Chest-Animation-when-Cancelling-Event.patch +++ b/CraftBukkit-Patches/0082-Update-Chest-Animation-when-Cancelling-Event.patch @@ -1,4 +1,4 @@ -From d4993990500cb690905e2a08ce7d37cd74fb40f6 Mon Sep 17 00:00:00 2001 +From 25675880fb47466f2099bf5e32ce1561a5a80a48 Mon Sep 17 00:00:00 2001 From: bloodshot Date: Mon, 6 Jan 2014 16:29:51 -0500 Subject: [PATCH] Update Chest Animation when Cancelling Event @@ -113,5 +113,5 @@ index ab39926..550ef44 100644 if (this.activeContainer != this.defaultContainer) { -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0084-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch b/CraftBukkit-Patches/0083-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch similarity index 96% rename from CraftBukkit-Patches/0084-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch rename to CraftBukkit-Patches/0083-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch index 2c4da77fa..0ccab3afa 100644 --- a/CraftBukkit-Patches/0084-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch +++ b/CraftBukkit-Patches/0083-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch @@ -1,4 +1,4 @@ -From 758a088dd2fc4bb2f80aef88332574003b35882b Mon Sep 17 00:00:00 2001 +From 27a70d527cd7404cc4f17786ffa2d061ad7b51da Mon Sep 17 00:00:00 2001 From: bloodshot Date: Mon, 6 Jan 2014 18:02:01 -0500 Subject: [PATCH] Update Client's Hand when BlockPlaceEvent Cancelled diff --git a/CraftBukkit-Patches/0085-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0084-Allow-statistics-to-be-disabled-forced.patch similarity index 97% rename from CraftBukkit-Patches/0085-Allow-statistics-to-be-disabled-forced.patch rename to CraftBukkit-Patches/0084-Allow-statistics-to-be-disabled-forced.patch index f3a9719b0..89a1f98af 100644 --- a/CraftBukkit-Patches/0085-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0084-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From 14d8d53e0ce9be370a14aa9ad04c279f2c633f26 Mon Sep 17 00:00:00 2001 +From 7d85a02bae8626a374cf666af39fd49ee33d51b7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 7 Jan 2014 15:56:26 +0000 Subject: [PATCH] Allow statistics to be disabled/forced @@ -90,5 +90,5 @@ index 69306cb..eaafc2d 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0086-Fix-anvil-collisions.patch b/CraftBukkit-Patches/0085-Fix-anvil-collisions.patch similarity index 90% rename from CraftBukkit-Patches/0086-Fix-anvil-collisions.patch rename to CraftBukkit-Patches/0085-Fix-anvil-collisions.patch index 7ce64aa5d..de4e2141a 100644 --- a/CraftBukkit-Patches/0086-Fix-anvil-collisions.patch +++ b/CraftBukkit-Patches/0085-Fix-anvil-collisions.patch @@ -1,4 +1,4 @@ -From 8df7a1623bb7189ef53ae9b715cd29d2e780241f Mon Sep 17 00:00:00 2001 +From e62b2ebf72b154a630101e72bc9f5748e973f37c Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 9 Jan 2014 14:19:12 +0000 Subject: [PATCH] Fix anvil collisions @@ -25,5 +25,5 @@ index 9e1ce2f..1fa14c5 100644 return false; } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0087-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0086-Fix-ItemStack-Unbreakable-Code.patch similarity index 91% rename from CraftBukkit-Patches/0087-Fix-ItemStack-Unbreakable-Code.patch rename to CraftBukkit-Patches/0086-Fix-ItemStack-Unbreakable-Code.patch index 985478c1e..cf90e78d4 100644 --- a/CraftBukkit-Patches/0087-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0086-Fix-ItemStack-Unbreakable-Code.patch @@ -1,4 +1,4 @@ -From 6209240be12264c5ab3a9fb966b0070634e835f9 Mon Sep 17 00:00:00 2001 +From 7256826d76a55cf90d83e2f6eb18ad4ef69051fc Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 10 Jan 2014 15:15:50 +1100 Subject: [PATCH] Fix ItemStack Unbreakable Code @@ -24,5 +24,5 @@ index f32322e..37ceade 100644 public boolean usesData() { -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0088-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0087-Try-and-Debug-Crash-Reports-Crashing.patch similarity index 95% rename from CraftBukkit-Patches/0088-Try-and-Debug-Crash-Reports-Crashing.patch rename to CraftBukkit-Patches/0087-Try-and-Debug-Crash-Reports-Crashing.patch index 41d7d296a..1226e7d1a 100644 --- a/CraftBukkit-Patches/0088-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0087-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,4 +1,4 @@ -From 02584e9b58c12fd11ac01f605188da4614e93500 Mon Sep 17 00:00:00 2001 +From 21da36b4f36d95539eb0cd73713ef4fd22c491ea Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 20:56:41 +1100 Subject: [PATCH] Try and Debug Crash Reports Crashing @@ -37,5 +37,5 @@ index 3f04557..7616d7b 100644 throw new ReportedException(crashreport); } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0089-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0088-Replace-AutoSave-Mechanism.patch similarity index 95% rename from CraftBukkit-Patches/0089-Replace-AutoSave-Mechanism.patch rename to CraftBukkit-Patches/0088-Replace-AutoSave-Mechanism.patch index 9acacab87..fc2ac8e18 100644 --- a/CraftBukkit-Patches/0089-Replace-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0088-Replace-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 881a1a02214adbec1f4b19c43aacb653b2713701 Mon Sep 17 00:00:00 2001 +From b4780634e857d007783e633c7df43107a21b09ce Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Replace AutoSave Mechanism @@ -28,5 +28,5 @@ index 7616d7b..588ce0a 100644 } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0090-Block-data-values-that-crash-the-client.patch b/CraftBukkit-Patches/0089-Block-data-values-that-crash-the-client.patch similarity index 96% rename from CraftBukkit-Patches/0090-Block-data-values-that-crash-the-client.patch rename to CraftBukkit-Patches/0089-Block-data-values-that-crash-the-client.patch index 62c61547f..7178bd24a 100644 --- a/CraftBukkit-Patches/0090-Block-data-values-that-crash-the-client.patch +++ b/CraftBukkit-Patches/0089-Block-data-values-that-crash-the-client.patch @@ -1,4 +1,4 @@ -From c393d7a9a1fa10421492081cc28b5f5c576e6c4a Mon Sep 17 00:00:00 2001 +From 6a25b4aefdfe5eaed8429d783e7921dfd78c15b7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 15 Jan 2014 21:52:47 +0000 Subject: [PATCH] Block data values that crash the client @@ -57,5 +57,5 @@ index 51ebb7e..944170b 100644 if (tileentity != null) { -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0091-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0090-Support-vanilla-s-direction-tag-on-fireballs.patch similarity index 95% rename from CraftBukkit-Patches/0091-Support-vanilla-s-direction-tag-on-fireballs.patch rename to CraftBukkit-Patches/0090-Support-vanilla-s-direction-tag-on-fireballs.patch index 467b04498..a6e39f9ce 100644 --- a/CraftBukkit-Patches/0091-Support-vanilla-s-direction-tag-on-fireballs.patch +++ b/CraftBukkit-Patches/0090-Support-vanilla-s-direction-tag-on-fireballs.patch @@ -1,4 +1,4 @@ -From 0c49444d17ecd3d12ab3edff2375f68e3dc93914 Mon Sep 17 00:00:00 2001 +From 05fca5b94e19a99012a1a29b1d547b2fcd9f09e4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 18 Jan 2014 14:27:03 +0000 Subject: [PATCH] Support vanilla's direction tag on fireballs @@ -32,5 +32,5 @@ index 939de5d..436e6a1 100644 this.die(); } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0092-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0091-Support-non-prefixed-URLs.patch similarity index 96% rename from CraftBukkit-Patches/0092-Support-non-prefixed-URLs.patch rename to CraftBukkit-Patches/0091-Support-non-prefixed-URLs.patch index 31c2dd13c..29601ae52 100644 --- a/CraftBukkit-Patches/0092-Support-non-prefixed-URLs.patch +++ b/CraftBukkit-Patches/0091-Support-non-prefixed-URLs.patch @@ -1,4 +1,4 @@ -From 4d3bf4f87b4546727ceb80f5089f12cb0668c513 Mon Sep 17 00:00:00 2001 +From 41e2883e6e67d11562f8a4e56e317f4954fae473 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 18 Jan 2014 19:32:42 +0000 Subject: [PATCH] Support non-prefixed URLs @@ -37,5 +37,5 @@ index 66368f4..f4de71c 100644 private void appendNewComponent(int index) { -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0093-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0092-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch similarity index 94% rename from CraftBukkit-Patches/0093-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch rename to CraftBukkit-Patches/0092-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index a1e280f4d..14c218305 100644 --- a/CraftBukkit-Patches/0093-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0092-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,4 +1,4 @@ -From b23012d7cf6830aa7ac71fd0b1a3ad360b68450b Mon Sep 17 00:00:00 2001 +From 483014259b7c13d66ff46ae0ced96b9637709640 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 20 Jan 2014 13:44:07 +1100 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. @@ -29,5 +29,5 @@ index 49b3f14..4d6a9da 100644 this.data = new int[j]; -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0094-Reduce-memory-of-hiddenPlayers-map.patch b/CraftBukkit-Patches/0093-Reduce-memory-of-hiddenPlayers-map.patch similarity index 92% rename from CraftBukkit-Patches/0094-Reduce-memory-of-hiddenPlayers-map.patch rename to CraftBukkit-Patches/0093-Reduce-memory-of-hiddenPlayers-map.patch index f5c8b9a41..2b4a225bc 100644 --- a/CraftBukkit-Patches/0094-Reduce-memory-of-hiddenPlayers-map.patch +++ b/CraftBukkit-Patches/0093-Reduce-memory-of-hiddenPlayers-map.patch @@ -1,4 +1,4 @@ -From 88a1710f2cdee7cc71c08ffc9b5451fc947618e8 Mon Sep 17 00:00:00 2001 +From 300076110a9f072897842a651684b60e04f02225 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 20 Jan 2014 13:50:32 +1100 Subject: [PATCH] Reduce memory of hiddenPlayers map. @@ -18,5 +18,5 @@ index 0e8fedf..a717d34 100644 private double health = 20; private boolean scaledHealth = false; -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0095-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0094-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch similarity index 94% rename from CraftBukkit-Patches/0095-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch rename to CraftBukkit-Patches/0094-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index ba83e3a07..680e836f8 100644 --- a/CraftBukkit-Patches/0095-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0094-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From 1854dcfac80bb453bc355573144a01da07fbfb8c Mon Sep 17 00:00:00 2001 +From 1172d6604faeecfc066674cc4c22d6127a27ec73 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks @@ -18,7 +18,7 @@ index bec5aa8..222e3ac 100644 for (l = j; !World.a((IBlockAccess) world, i, l, k) && l > 0; --l) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 018ec18..5a6e369 100644 +index 558e9cd..ffdb33e 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -257,4 +257,11 @@ public class SpigotWorldConfig @@ -34,5 +34,5 @@ index 018ec18..5a6e369 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0096-Don-t-let-trees-replace-any-block-when-growing.patch b/CraftBukkit-Patches/0095-Don-t-let-trees-replace-any-block-when-growing.patch similarity index 94% rename from CraftBukkit-Patches/0096-Don-t-let-trees-replace-any-block-when-growing.patch rename to CraftBukkit-Patches/0095-Don-t-let-trees-replace-any-block-when-growing.patch index be769f5ff..b1f3993bb 100644 --- a/CraftBukkit-Patches/0096-Don-t-let-trees-replace-any-block-when-growing.patch +++ b/CraftBukkit-Patches/0095-Don-t-let-trees-replace-any-block-when-growing.patch @@ -1,4 +1,4 @@ -From 5063e3237baec48336b0205cf5a11f20f04b4157 Mon Sep 17 00:00:00 2001 +From 918bd00dca369a49e687125497a75a6250a4da04 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 20 Jan 2014 20:42:28 +0000 Subject: [PATCH] Don't let trees replace any block when growing @@ -23,5 +23,5 @@ index 71ce973..caaac9a 100644 int l3; -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0097-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0096-Highly-Optimized-Tick-Loop.patch similarity index 99% rename from CraftBukkit-Patches/0097-Highly-Optimized-Tick-Loop.patch rename to CraftBukkit-Patches/0096-Highly-Optimized-Tick-Loop.patch index 2d58266ff..ac4a541c8 100644 --- a/CraftBukkit-Patches/0097-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0096-Highly-Optimized-Tick-Loop.patch @@ -1,4 +1,4 @@ -From 30e1269996adb48b469645a79a15d32c4e4e9df8 Mon Sep 17 00:00:00 2001 +From 1724d1265735b9e88a66f636fe59f56c2c19f0b4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/CraftBukkit-Patches/0098-Add-Spigot-Links.patch b/CraftBukkit-Patches/0097-Add-Spigot-Links.patch similarity index 98% rename from CraftBukkit-Patches/0098-Add-Spigot-Links.patch rename to CraftBukkit-Patches/0097-Add-Spigot-Links.patch index a0ec8d417..e10e8dab3 100644 --- a/CraftBukkit-Patches/0098-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0097-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 353871edff876dcedf7aa8b0d51cae408781c047 Mon Sep 17 00:00:00 2001 +From 5186fc433a7105c196fe88958919f50f3d4b60a8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 23 Jan 2014 13:17:35 +1100 Subject: [PATCH] Add Spigot Links diff --git a/CraftBukkit-Patches/0099-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0098-Configurable-Ping-Sample-Size.patch similarity index 95% rename from CraftBukkit-Patches/0099-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0098-Configurable-Ping-Sample-Size.patch index 861b1dcda..943c9d3c4 100644 --- a/CraftBukkit-Patches/0099-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0098-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From 0db2a554328aa2ef05cff12de0e1d22a20b05cd8 Mon Sep 17 00:00:00 2001 +From 73f8859daf3ee1a36875117a75c29e3768cce9d0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 26 Jan 2014 21:48:34 +1100 Subject: [PATCH] Configurable Ping Sample Size @@ -39,5 +39,5 @@ index 713b351..ba28878 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0100-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0099-Add-Optional-Tick-Shuffling.patch similarity index 95% rename from CraftBukkit-Patches/0100-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0099-Add-Optional-Tick-Shuffling.patch index 65464a673..1b4cf5701 100644 --- a/CraftBukkit-Patches/0100-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0099-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 3368f5075f2101e90bc0240d849030366a39732b Mon Sep 17 00:00:00 2001 +From a3279dfe82ec0c4d265fc1f9cebdc93ba55cc192 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Jan 2014 08:39:26 +1100 Subject: [PATCH] Add Optional Tick Shuffling @@ -39,5 +39,5 @@ index ba28878..61fb942 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0101-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0100-Allow-Configuring-Chunks-per-Packet.patch similarity index 93% rename from CraftBukkit-Patches/0101-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0100-Allow-Configuring-Chunks-per-Packet.patch index d0206f366..21e99e59f 100644 --- a/CraftBukkit-Patches/0101-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0100-Allow-Configuring-Chunks-per-Packet.patch @@ -1,4 +1,4 @@ -From a45410f3c8ae0da95a25556f7c7cbb9c2e638e9b Mon Sep 17 00:00:00 2001 +From b658a1aac1f873ada97223a132133c29c102fd4f Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 28 Jan 2014 20:35:35 +1100 Subject: [PATCH] Allow Configuring Chunks per Packet @@ -18,7 +18,7 @@ index 550ef44..9b853a9 100644 if (chunkcoordintpair != null) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 5a6e369..4cff009 100644 +index ffdb33e..1290829 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -264,4 +264,11 @@ public class SpigotWorldConfig @@ -34,5 +34,5 @@ index 5a6e369..4cff009 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0102-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0101-Implement-Locale-Getter-for-Players.patch similarity index 95% rename from CraftBukkit-Patches/0102-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0101-Implement-Locale-Getter-for-Players.patch index 08384497d..b3dc54e8a 100644 --- a/CraftBukkit-Patches/0102-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0101-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 8d5ba516981ae96eb4d37b74a6e0ef5a25709739 Mon Sep 17 00:00:00 2001 +From 81fe5e35568eb73bccd6c13782c86e2929bec101 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players @@ -35,5 +35,5 @@ index a717d34..53c8a0b 100644 public Player.Spigot spigot() -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0103-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0102-Cap-Entity-Collisions.patch similarity index 96% rename from CraftBukkit-Patches/0103-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0102-Cap-Entity-Collisions.patch index 4df49087a..a0e71017b 100644 --- a/CraftBukkit-Patches/0103-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0102-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From b5aa35da1269ff5aee101088271f109376684cba Mon Sep 17 00:00:00 2001 +From a33f8eb39831a220a36fac3b73a5efcc828f79cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions @@ -46,7 +46,7 @@ index 35b2f75..ab28bd3 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 4cff009..979b315 100644 +index 1290829..b12a086 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -271,4 +271,11 @@ public class SpigotWorldConfig @@ -62,5 +62,5 @@ index 4cff009..979b315 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0104-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0103-Fix-dispensing-bone-meal-not-having-the-correct-data.patch similarity index 93% rename from CraftBukkit-Patches/0104-Fix-dispensing-bone-meal-not-having-the-correct-data.patch rename to CraftBukkit-Patches/0103-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 184846355..9170396e0 100644 --- a/CraftBukkit-Patches/0104-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0103-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From f0271bbf68219efc5e8a12917b77c299b794eeb9 Mon Sep 17 00:00:00 2001 +From 2e834d6fc4e1756fed97819121f81d21bb6b00e0 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 6 Feb 2014 21:59:20 +0000 Subject: [PATCH] Fix dispensing bone meal not having the correct data value @@ -18,5 +18,5 @@ index 92b3789..a164627 100644 BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0)); if (!BlockDispenser.eventFired) { -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0105-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0104-Spam-Filter-Exclusions.patch similarity index 97% rename from CraftBukkit-Patches/0105-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0104-Spam-Filter-Exclusions.patch index e60a57036..1d02c1d6e 100644 --- a/CraftBukkit-Patches/0105-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0104-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From e67b722b97fcf2cffa5f3fa31f3dcad8afe494e6 Mon Sep 17 00:00:00 2001 +From 57fecb80dcad290e85e23782952b17c68b26fe4f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 8 Feb 2014 08:13:40 +0000 Subject: [PATCH] Spam Filter Exclusions diff --git a/CraftBukkit-Patches/0106-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0105-Add-Option-to-Silence-CommandBlock-Console.patch similarity index 94% rename from CraftBukkit-Patches/0106-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0105-Add-Option-to-Silence-CommandBlock-Console.patch index 61bd65eb9..4e692999c 100644 --- a/CraftBukkit-Patches/0106-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0105-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 93c0ef3e537b374488ac7cc9b868f64977a4e529 Mon Sep 17 00:00:00 2001 +From 38a056dfb5e58b7716c5afa8bde3cbfdbcb45474 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 9 Feb 2014 14:39:01 +1100 Subject: [PATCH] Add Option to Silence CommandBlock Console @@ -33,5 +33,5 @@ index 8da3cc9..7cba69f 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0107-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0106-Add-support-for-fetching-hidden-players.patch similarity index 91% rename from CraftBukkit-Patches/0107-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0106-Add-support-for-fetching-hidden-players.patch index b52ce4bee..978775d43 100644 --- a/CraftBukkit-Patches/0107-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0106-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 03ceee9e1a011f7ecdd96ce6c571d0f5264f74cb Mon Sep 17 00:00:00 2001 +From eee19a89c393256b8c58fa423828d810168fff3a Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players @@ -22,5 +22,5 @@ index 53c8a0b..db6e5b8 100644 public Player.Spigot spigot() -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0108-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0107-Allow-Disabling-Creative-Item-Filter.patch similarity index 96% rename from CraftBukkit-Patches/0108-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0107-Allow-Disabling-Creative-Item-Filter.patch index 570ca3574..5689b570c 100644 --- a/CraftBukkit-Patches/0108-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0107-Allow-Disabling-Creative-Item-Filter.patch @@ -1,4 +1,4 @@ -From 920db20e433e577e3478b52ae8637fc5d15fea12 Mon Sep 17 00:00:00 2001 +From b034ff27217c1834f176e23717811f923bca9518 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter diff --git a/CraftBukkit-Patches/0109-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0108-Cap-Channel-Registrations.patch similarity index 91% rename from CraftBukkit-Patches/0109-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0108-Cap-Channel-Registrations.patch index 44e5e2cdf..e3a305919 100644 --- a/CraftBukkit-Patches/0109-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0108-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From 66c35080d7b742d51843ee7b424af851ae2f27b4 Mon Sep 17 00:00:00 2001 +From 9d018764d904960b8709796fe2e62427f071b130 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations @@ -17,5 +17,5 @@ index db6e5b8..9b0672b 100644 server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0110-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0109-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch similarity index 99% rename from CraftBukkit-Patches/0110-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch rename to CraftBukkit-Patches/0109-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index 06b63974d..d0499dd33 100644 --- a/CraftBukkit-Patches/0110-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0109-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,4 +1,4 @@ -From 7d4c6d3b7b69a67c0d82284800b0fa2ffeb6fbb6 Mon Sep 17 00:00:00 2001 +From cf2ab14c801ffaeae6e1aa33ae9f5fb243c5f55a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command @@ -168,5 +168,5 @@ index 7589246..df70756 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0111-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0110-Unfinalize-the-isDisconnected-method-by-bukkit.patch similarity index 93% rename from CraftBukkit-Patches/0111-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0110-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 1cc258d97..9c0099735 100644 --- a/CraftBukkit-Patches/0111-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0110-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From bb0f910435c62c1cad0c8ae5d488602c32395a74 Mon Sep 17 00:00:00 2001 +From 0d544b9767252bcfe1527729249456444ef84970 Mon Sep 17 00:00:00 2001 From: hcherndon Date: Sat, 15 Feb 2014 01:51:20 -0600 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. diff --git a/CraftBukkit-Patches/0112-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0111-Implement-Silenceable-Lightning-API.patch similarity index 97% rename from CraftBukkit-Patches/0112-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0111-Implement-Silenceable-Lightning-API.patch index f664ee70f..81e4b5eb4 100644 --- a/CraftBukkit-Patches/0112-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0111-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 0b6d3f3a88c9d4dbd48127e08b46e087bb4b77fa Mon Sep 17 00:00:00 2001 +From 70e8bd8516a104cbcd2c7c4113b537ef384d0b79 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -101,5 +101,5 @@ index 64e346d..be4f10f 100644 + // Spigot end } -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0113-Normalize-spaces-on-when-reading-a-chat-packet.patch b/CraftBukkit-Patches/0112-Normalize-spaces-on-when-reading-a-chat-packet.patch similarity index 95% rename from CraftBukkit-Patches/0113-Normalize-spaces-on-when-reading-a-chat-packet.patch rename to CraftBukkit-Patches/0112-Normalize-spaces-on-when-reading-a-chat-packet.patch index f0f4dca4c..04bd858e5 100644 --- a/CraftBukkit-Patches/0113-Normalize-spaces-on-when-reading-a-chat-packet.patch +++ b/CraftBukkit-Patches/0112-Normalize-spaces-on-when-reading-a-chat-packet.patch @@ -1,4 +1,4 @@ -From a4e6058ce985acf7afe2f8c02a2dfa1264cdf1d5 Mon Sep 17 00:00:00 2001 +From 20c4dc2e269c61ce149dabec117067240000e70e Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 26 Feb 2014 14:45:22 +0000 Subject: [PATCH] Normalize spaces on when reading a chat packet @@ -31,5 +31,5 @@ index f84df92..b68cd97 100644 for (int i = 0; i < s.length(); ++i) { if (!SharedConstants.isAllowedChatCharacter(s.charAt(i))) { -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0114-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0113-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 94% rename from CraftBukkit-Patches/0114-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0113-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 27c414f61..6797d3efc 100644 --- a/CraftBukkit-Patches/0114-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0113-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From aefc5f0df1c5ec8a8172bef74967b1f34336d200 Mon Sep 17 00:00:00 2001 +From 72a305e3f7a8cadf41ca817b452c418ba79de2c5 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 2 Mar 2014 21:13:46 +0100 Subject: [PATCH] Use one PermissibleBase for all Command Blocks @@ -29,5 +29,5 @@ index 1314c74..b339cf3 100644 public boolean isPermissionSet(String name) { -- -1.7.9.5 +1.8.3.2 diff --git a/CraftBukkit-Patches/0115-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0114-Prevent-hoppers-from-loading-chunks.patch similarity index 91% rename from CraftBukkit-Patches/0115-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0114-Prevent-hoppers-from-loading-chunks.patch index 24025e304..198fe4af9 100644 --- a/CraftBukkit-Patches/0115-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0114-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From bc66ed9af64c942a9b4b0f24a498e8840313bbf5 Mon Sep 17 00:00:00 2001 +From 47f4778274f8a29b3dbbd7d63210a51f603cb947 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 5 Mar 2014 20:27:27 +0000 Subject: [PATCH] Prevent hoppers from loading chunks @@ -17,5 +17,5 @@ index a68b748..fc0d2b3 100644 if (tileentity != null && tileentity instanceof IInventory) { -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0050-Guard-entity-list.patch b/CraftBukkit-Patches/0115-Guard-entity-list.patch similarity index 90% rename from CraftBukkit-Patches/0050-Guard-entity-list.patch rename to CraftBukkit-Patches/0115-Guard-entity-list.patch index 9a6eec0a2..3a706f46d 100644 --- a/CraftBukkit-Patches/0050-Guard-entity-list.patch +++ b/CraftBukkit-Patches/0115-Guard-entity-list.patch @@ -1,11 +1,11 @@ -From 38c40e66efdfe76a60e5c1e508dc21bae94b4733 Mon Sep 17 00:00:00 2001 +From 650dacaaa5ff0cdb2050aff041af1453241dc8cf Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Sat, 3 Aug 2013 21:42:00 +0500 Subject: [PATCH] Guard entity list diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5fb3fbf..0923296 100644 +index 6ec7f5a..9bc4256 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent; @@ -43,7 +43,7 @@ index 5fb3fbf..0923296 100644 protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList; protected float growthOdds = 100; protected float modifiedOdds = 100; -@@ -1032,7 +1051,12 @@ public abstract class World implements IBlockAccess { +@@ -1033,7 +1052,12 @@ public abstract class World implements IBlockAccess { if (index <= this.tickPosition) { this.tickPosition--; } @@ -56,7 +56,7 @@ index 5fb3fbf..0923296 100644 } // CraftBukkit end -@@ -1252,6 +1276,7 @@ public abstract class World implements IBlockAccess { +@@ -1272,6 +1296,7 @@ public abstract class World implements IBlockAccess { org.spigotmc.ActivationRange.activateEntities(this); // Spigot timings.entityTick.startTiming(); // Spigot @@ -64,7 +64,7 @@ index 5fb3fbf..0923296 100644 // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { entity = (Entity) this.entityList.get(this.tickPosition); -@@ -1300,12 +1325,15 @@ public abstract class World implements IBlockAccess { +@@ -1320,12 +1345,15 @@ public abstract class World implements IBlockAccess { this.getChunkAt(j, k).b(entity); } @@ -81,5 +81,5 @@ index 5fb3fbf..0923296 100644 timings.entityTick.stopTiming(); // Spigot this.methodProfiler.c("blockEntities"); -- -1.8.4.msysgit.0 +1.8.3.2