diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index eda7015c6..0dbaa1a97 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From dd1ac6c30d00ee3df85d519665f0542dce550125 Mon Sep 17 00:00:00 2001 +From 626a7293d8a78d0aa5383605240d53a57f93dd53 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/Bukkit-Patches/0002-Spigot-Timings.patch b/Bukkit-Patches/0002-Spigot-Timings.patch index 94515c32c..e6d34fe41 100644 --- a/Bukkit-Patches/0002-Spigot-Timings.patch +++ b/Bukkit-Patches/0002-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From b0a368f53e4f88a99b1b2bdbabc4815a501710d4 Mon Sep 17 00:00:00 2001 +From 06701983001af96d02a1cc0ebf29b2d251d8d0bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 2 Jun 2013 10:42:57 +1000 Subject: [PATCH] Spigot Timings @@ -8,10 +8,10 @@ Adds performance tracking timings all around the Minecraft Server, and improves Plugins can track their own timings with CustomTimingsHandler diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 1eaf92d..cc071c6 100644 +index 2c43d9e..af5fe07 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -301,6 +301,7 @@ public final class Bukkit { +@@ -541,6 +541,7 @@ public final class Bukkit { */ public static void reload() { server.reload(); @@ -19,7 +19,7 @@ index 1eaf92d..cc071c6 100644 } /** -@@ -747,4 +748,9 @@ public final class Bukkit { +@@ -1121,4 +1122,9 @@ public final class Bukkit { public static UnsafeValues getUnsafe() { return server.getUnsafe(); } @@ -30,10 +30,10 @@ index 1eaf92d..cc071c6 100644 + } } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e14e9f1..573b33b 100644 +index ab6d047..a57d506 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -916,4 +916,15 @@ public interface Server extends PluginMessageRecipient { +@@ -917,4 +917,15 @@ public interface Server extends PluginMessageRecipient { */ @Deprecated UnsafeValues getUnsafe(); @@ -50,7 +50,7 @@ index e14e9f1..573b33b 100644 + Spigot spigot(); } diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 87c33d9..31e4f66 100644 +index e5fb0f8..e4c60ca 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -31,6 +31,7 @@ public abstract class Command { @@ -69,7 +69,7 @@ index 87c33d9..31e4f66 100644 } /** -@@ -200,6 +202,7 @@ public abstract class Command { +@@ -207,6 +209,7 @@ public abstract class Command { public boolean setLabel(String name) { this.nextLabel = name; if (!isRegistered()) { @@ -276,7 +276,7 @@ index d2fe422..1d51908 100644 } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index fb0bfba..3e60a7b 100644 +index 687029f..b081ecb 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -39,6 +39,7 @@ import org.bukkit.plugin.PluginLoader; @@ -295,7 +295,7 @@ index fb0bfba..3e60a7b 100644 /** * This class was not meant to be constructed explicitly -@@ -284,13 +286,19 @@ public final class JavaPluginLoader implements PluginLoader { +@@ -286,13 +288,19 @@ public final class JavaPluginLoader implements PluginLoader { } } @@ -315,7 +315,7 @@ index fb0bfba..3e60a7b 100644 } catch (InvocationTargetException ex) { throw new EventException(ex.getCause()); } catch (Throwable t) { -@@ -298,7 +306,7 @@ public final class JavaPluginLoader implements PluginLoader { +@@ -300,7 +308,7 @@ public final class JavaPluginLoader implements PluginLoader { } } }; diff --git a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch index 7bc1dc197..51fa19942 100644 --- a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch +++ b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 22072de889e694efa2591459aa9ef70543589e52 Mon Sep 17 00:00:00 2001 +From 35408cbfc22821fde7b03ef3b882586d594f63b1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:31:20 +1100 Subject: [PATCH] Add PlayerItemDamageEvent diff --git a/Bukkit-Patches/0004-BungeeCord-Support.patch b/Bukkit-Patches/0004-BungeeCord-Support.patch index 893ee0c2a..28a8c297a 100644 --- a/Bukkit-Patches/0004-BungeeCord-Support.patch +++ b/Bukkit-Patches/0004-BungeeCord-Support.patch @@ -1,14 +1,14 @@ -From ec36673732a8222bd6fdd768caa5cd10af0c9a8d Mon Sep 17 00:00:00 2001 +From a8b2d4d00fef5ae934b8a868914942cc307152e1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index fe8a0bd..e851b98 100644 +index 229a71a..31526a3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1035,4 +1035,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1037,4 +1037,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @see Player#setHealthScaled(boolean) */ public double getHealthScale(); @@ -33,7 +33,7 @@ index fe8a0bd..e851b98 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java -index b74b7b8..081e994 100644 +index 68834dd..4bc024f 100644 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java @@ -14,6 +14,7 @@ public class PlayerLoginEvent extends PlayerEvent { @@ -44,7 +44,7 @@ index b74b7b8..081e994 100644 /** * @deprecated Address should be provided in other constructor -@@ -40,10 +41,17 @@ public class PlayerLoginEvent extends PlayerEvent { +@@ -43,10 +44,17 @@ public class PlayerLoginEvent extends PlayerEvent { * @param address The address the player used to connect, provided for * timing issues */ @@ -63,7 +63,7 @@ index b74b7b8..081e994 100644 } /** -@@ -52,7 +60,7 @@ public class PlayerLoginEvent extends PlayerEvent { +@@ -58,7 +66,7 @@ public class PlayerLoginEvent extends PlayerEvent { */ @Deprecated public PlayerLoginEvent(final Player player, final Result result, final String message) { @@ -72,7 +72,7 @@ index b74b7b8..081e994 100644 } /** -@@ -65,12 +73,23 @@ public class PlayerLoginEvent extends PlayerEvent { +@@ -71,12 +79,23 @@ public class PlayerLoginEvent extends PlayerEvent { * @param result The result status for this event * @param message The message to be displayed if result denies login */ diff --git a/Bukkit-Patches/0005-Add-Arrow-API.patch b/Bukkit-Patches/0005-Add-Arrow-API.patch index 018c3f829..39c90ebb9 100644 --- a/Bukkit-Patches/0005-Add-Arrow-API.patch +++ b/Bukkit-Patches/0005-Add-Arrow-API.patch @@ -1,4 +1,4 @@ -From 49201e12ef4fa652371f467ab74a8d3fc97b8819 Mon Sep 17 00:00:00 2001 +From b28fa0f7e5f1a12e31220211fdebefda5b2f9a39 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:08:24 +1000 Subject: [PATCH] Add Arrow API diff --git a/Bukkit-Patches/0006-Add-Particle-API.patch b/Bukkit-Patches/0006-Add-Particle-API.patch index 121228861..25ab2d741 100644 --- a/Bukkit-Patches/0006-Add-Particle-API.patch +++ b/Bukkit-Patches/0006-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From 4e94c64d46706f12a51a9582248fc219e91ba5c9 Mon Sep 17 00:00:00 2001 +From 793c5a6c9904fdaca5d3454d36cc4e21a95b3737 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API @@ -271,10 +271,10 @@ index 2474a2d..37f29e2 100644 + public enum Type {SOUND, VISUAL, PARTICLE} } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 9bf2c41..6cf3ff0 100644 +index d306201..a909073 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1155,6 +1155,56 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1167,6 +1167,56 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public boolean isGameRule(String rule); @@ -332,10 +332,10 @@ index 9bf2c41..6cf3ff0 100644 * Represents various map environment types that a world may be */ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e851b98..c6bb787 100644 +index 31526a3..0810c68 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1050,6 +1050,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1052,6 +1052,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch index 5588e07ec..c9379e277 100644 --- a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch +++ b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From e8e1da764520aaca81f71226b5ee28b2b03d6f56 Mon Sep 17 00:00:00 2001 +From 1ddc82311725fbbc515d5c161781379f90bef9eb Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:01 -0500 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent diff --git a/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch index cc42eb362..4721f06c1 100644 --- a/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch +++ b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From 4628c568a6f40da7af00dd0a408d742325b5bcd4 Mon Sep 17 00:00:00 2001 +From 4db37abe6f0d9c33f0ded9db1103ab10221fb8b4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:53 +1000 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/Bukkit-Patches/0009-Update-Depends.patch b/Bukkit-Patches/0009-Update-Depends.patch index c648a363e..9a4e4ad13 100644 --- a/Bukkit-Patches/0009-Update-Depends.patch +++ b/Bukkit-Patches/0009-Update-Depends.patch @@ -1,4 +1,4 @@ -From 7b44571affe815589259e70786fb3073f827a9a1 Mon Sep 17 00:00:00 2001 +From a1d01997d5b3c29406f889a50e6d1abe333ab56d Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 4 Jul 2013 20:05:19 +1000 Subject: [PATCH] Update Depends diff --git a/Bukkit-Patches/0010-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0010-InventoryClickEvent-getClickedInventory.patch index adfa8fa6b..6c6406769 100644 --- a/Bukkit-Patches/0010-InventoryClickEvent-getClickedInventory.patch +++ b/Bukkit-Patches/0010-InventoryClickEvent-getClickedInventory.patch @@ -1,4 +1,4 @@ -From 3d6ccae10dacffd2a1e1b88fc8684e91615491db Mon Sep 17 00:00:00 2001 +From 2342cce8494165ce97322e3328362db7f5265037 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 7 Jul 2013 10:32:05 -0400 Subject: [PATCH] InventoryClickEvent getClickedInventory diff --git a/Bukkit-Patches/0011-Added-getAllSessionData-to-the-Conversation-API.patch b/Bukkit-Patches/0011-Added-getAllSessionData-to-the-Conversation-API.patch index 7a8ab2fdb..ac0a281f6 100644 --- a/Bukkit-Patches/0011-Added-getAllSessionData-to-the-Conversation-API.patch +++ b/Bukkit-Patches/0011-Added-getAllSessionData-to-the-Conversation-API.patch @@ -1,4 +1,4 @@ -From fcb2b26c3c2667fe9ace094a0f7761b94c8a2227 Mon Sep 17 00:00:00 2001 +From 1ea7e8ad9ead0d6cd126387608c0543244b68a3d Mon Sep 17 00:00:00 2001 From: Alex Bennett Date: Thu, 11 Jul 2013 15:31:32 -0500 Subject: [PATCH] Added getAllSessionData() to the Conversation API. diff --git a/Bukkit-Patches/0012-Catch-Conversation-API-Errors.patch b/Bukkit-Patches/0012-Catch-Conversation-API-Errors.patch index 96f50255f..800f056ee 100644 --- a/Bukkit-Patches/0012-Catch-Conversation-API-Errors.patch +++ b/Bukkit-Patches/0012-Catch-Conversation-API-Errors.patch @@ -1,4 +1,4 @@ -From fb647ff8d9496446af81c8cc3c8b7601307f49e8 Mon Sep 17 00:00:00 2001 +From bd775c3569e6cd82d7100a37d2f3c697fe879ab9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 22 Jul 2013 19:09:43 +1000 Subject: [PATCH] Catch Conversation API Errors diff --git a/Bukkit-Patches/0013-Player-Collision-API.patch b/Bukkit-Patches/0013-Player-Collision-API.patch index 5df678579..107d12ac7 100644 --- a/Bukkit-Patches/0013-Player-Collision-API.patch +++ b/Bukkit-Patches/0013-Player-Collision-API.patch @@ -1,14 +1,14 @@ -From 4acd1068f9b97d884691f4ad67155fc12137d88b Mon Sep 17 00:00:00 2001 +From e76c98d100815eea690734eb3d0e4fa766f51000 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:20:50 +1000 Subject: [PATCH] Player Collision API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c6bb787..b879ecb 100644 +index 0810c68..597bca1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1055,6 +1055,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1057,6 +1057,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0014-Expand-Boolean-Prompt-Values.patch b/Bukkit-Patches/0014-Expand-Boolean-Prompt-Values.patch index 5e9916cb1..1f67e411c 100644 --- a/Bukkit-Patches/0014-Expand-Boolean-Prompt-Values.patch +++ b/Bukkit-Patches/0014-Expand-Boolean-Prompt-Values.patch @@ -1,4 +1,4 @@ -From 087f69161489f86c83539227ce904da9083e2936 Mon Sep 17 00:00:00 2001 +From 9f076ca35e20c23c3b897af47c987ed09915d116 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:42:16 +1000 Subject: [PATCH] Expand Boolean Prompt Values diff --git a/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch index e07424f62..919a0a960 100644 --- a/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch +++ b/Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch @@ -1,14 +1,14 @@ -From 67afcb6369ce63129febfee23b98af40eb087e9d Mon Sep 17 00:00:00 2001 +From bacd16b4a31a5c592198e722a4840d375e414ab3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:49:36 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 39c35c0..d1189ef 100644 +index 9fa886f..dc1e5da 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -340,4 +340,22 @@ public interface Entity extends Metadatable { +@@ -341,4 +341,22 @@ public interface Entity extends Metadatable { * @return if the custom name is displayed */ public boolean isCustomNameVisible(); diff --git a/Bukkit-Patches/0016-Add-respawn-API.patch b/Bukkit-Patches/0016-Add-respawn-API.patch index 529022ff8..46508fcdb 100644 --- a/Bukkit-Patches/0016-Add-respawn-API.patch +++ b/Bukkit-Patches/0016-Add-respawn-API.patch @@ -1,14 +1,14 @@ -From bf72ae80438382daf8d9f521134cf179a7190737 Mon Sep 17 00:00:00 2001 +From 2de6d85f734c7d63698348a23dcb1bf574882eb4 Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:35:58 +0200 Subject: [PATCH] Add respawn API. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b879ecb..6559243 100644 +index 597bca1..da4da7c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1076,6 +1076,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1078,6 +1078,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0017-Fix-Plugin-Message-API-Disconnects.patch b/Bukkit-Patches/0017-Fix-Plugin-Message-API-Disconnects.patch index 86ff61967..404d4af82 100644 --- a/Bukkit-Patches/0017-Fix-Plugin-Message-API-Disconnects.patch +++ b/Bukkit-Patches/0017-Fix-Plugin-Message-API-Disconnects.patch @@ -1,4 +1,4 @@ -From 0c34aae223d9c348e66229d0417ab1edc8c0aa0e Mon Sep 17 00:00:00 2001 +From 12b7c52f44eefe1abc525c1075c83fca7e66107a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 19 Oct 2013 12:59:42 +1100 Subject: [PATCH] Fix Plugin Message API Disconnects diff --git a/Bukkit-Patches/0018-Fix-Tab-Completion-for-Some-Commands.patch b/Bukkit-Patches/0018-Fix-Tab-Completion-for-Some-Commands.patch index 3a1c4016f..bbe8f23df 100644 --- a/Bukkit-Patches/0018-Fix-Tab-Completion-for-Some-Commands.patch +++ b/Bukkit-Patches/0018-Fix-Tab-Completion-for-Some-Commands.patch @@ -1,4 +1,4 @@ -From 349cd47d9d2c3106268c159fffc22ecb1f7c5cf4 Mon Sep 17 00:00:00 2001 +From b21c6424ec427aad72d53accf9236ffe7eb812f5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 24 Dec 2013 10:14:25 +1100 Subject: [PATCH] Fix Tab Completion for Some Commands diff --git a/Bukkit-Patches/0019-Add-Spigot-Links.patch b/Bukkit-Patches/0019-Add-Spigot-Links.patch index af66ba3e9..460b87bee 100644 --- a/Bukkit-Patches/0019-Add-Spigot-Links.patch +++ b/Bukkit-Patches/0019-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 6e52589f3fd5a62af1f1d7ab5f3675c3abe2b44f Mon Sep 17 00:00:00 2001 +From f3747d42f64987b41461b524c51ab17e19749ef9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 23 Jan 2014 13:17:38 +1100 Subject: [PATCH] Add Spigot Links diff --git a/Bukkit-Patches/0020-Implement-Locale-Getter-for-Players.patch b/Bukkit-Patches/0020-Implement-Locale-Getter-for-Players.patch index 79c695375..809f33710 100644 --- a/Bukkit-Patches/0020-Implement-Locale-Getter-for-Players.patch +++ b/Bukkit-Patches/0020-Implement-Locale-Getter-for-Players.patch @@ -1,14 +1,14 @@ -From 90d2cf3540f67d6c800368a956d7d30c26848d43 Mon Sep 17 00:00:00 2001 +From 382384ef968b8eaef01afb523caa0d2c054f8e36 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:10:49 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 6559243..2cc19a7 100644 +index da4da7c..57e6eae 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1084,6 +1084,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1086,6 +1086,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0021-Add-support-for-fetching-hidden-players.patch b/Bukkit-Patches/0021-Add-support-for-fetching-hidden-players.patch index 59f8e7409..e849ddfe5 100644 --- a/Bukkit-Patches/0021-Add-support-for-fetching-hidden-players.patch +++ b/Bukkit-Patches/0021-Add-support-for-fetching-hidden-players.patch @@ -1,14 +1,14 @@ -From fae0a406ff3f9fabd710b087a4f5832aa6d286e6 Mon Sep 17 00:00:00 2001 +From 2185fb3d84d8548c4a880e86e8686d8dfcb8fed6 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:02:11 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2cc19a7..37c8a58 100644 +index 57e6eae..7ed0f6a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1094,6 +1094,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1096,6 +1096,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0022-Silenceable-Lightning-API.patch b/Bukkit-Patches/0022-Silenceable-Lightning-API.patch index 38b019f8f..4ee6c02ad 100644 --- a/Bukkit-Patches/0022-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0022-Silenceable-Lightning-API.patch @@ -1,14 +1,14 @@ -From 5f2f41da4c36fb986e6983189c88a9d2724b2c2d Mon Sep 17 00:00:00 2001 +From 068c3416cfb2542f94308893bfe6932f01870acb Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:29 -0400 Subject: [PATCH] Silenceable Lightning API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 6cf3ff0..ab73174 100644 +index a909073..fd399d3 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1200,6 +1200,30 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1212,6 +1212,30 @@ public interface World extends PluginMessageRecipient, Metadatable { { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch b/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch index 85b3bae6d..1d2c23895 100644 --- a/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch +++ b/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch @@ -1,4 +1,4 @@ -From 2e00384fb6d1ad3049d6b0cab07b128c4d7892f1 Mon Sep 17 00:00:00 2001 +From 3a749aa1121dff4ead2d7eed05e89f15bb76c5ab Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 30 Mar 2014 15:58:22 +1100 Subject: [PATCH] Remove deprecation on some player lookup methods @@ -6,35 +6,50 @@ Subject: [PATCH] Remove deprecation on some player lookup methods Most of these methods still have plenty of use given that only one player with each name can exist at a time. Deprecating these methods renders even basic functionality such as /msg impossible without causing compiler warnings. We will maintain this API and it should be considered safe and appropriate for most use cases. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index cc071c6..b85a699 100644 +index af5fe07..2ab17db 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -197,7 +197,6 @@ public final class Bukkit { - /** - * @see Server#getPlayer(String name) +@@ -372,12 +372,9 @@ public final class Bukkit { + *

+ * This method may not return objects for offline players. + * +- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer +- * guaranteed to be unique + * @param name the name to look up + * @return a player if one was found, null otherwise */ - @Deprecated public static Player getPlayer(String name) { return server.getPlayer(name); } -@@ -205,7 +204,6 @@ public final class Bukkit { +@@ -385,12 +382,9 @@ public final class Bukkit { /** - * @see Server#matchPlayer(String name) - */ -- @Deprecated - public static List matchPlayer(String name) { - return server.matchPlayer(name); - } -@@ -448,7 +446,6 @@ public final class Bukkit { - /** - * @see Server#getPlayerExact(String name) + * Gets the player with the exact given name, case insensitive. + * +- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer +- * guaranteed to be unique + * @param name Exact name of the player to retrieve + * @return a player object if one was found, null otherwise */ - @Deprecated public static Player getPlayerExact(String name) { return server.getPlayerExact(name); } +@@ -402,12 +396,9 @@ public final class Bukkit { + * This list is not sorted in any particular order. If an exact match is + * found, the returned list will only contain a single result. + * +- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer +- * guaranteed to be unique + * @param name the (partial) name to match + * @return list of all possible players + */ +- @Deprecated + public static List matchPlayer(String name) { + return server.matchPlayer(name); + } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 573b33b..f861214 100644 +index a57d506..57b2794 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -308,23 +308,17 @@ public interface Server extends PluginMessageRecipient { diff --git a/Bukkit-Patches/0024-Expand-team-API-to-allow-arbitrary-strings.patch b/Bukkit-Patches/0024-Expand-team-API-to-allow-arbitrary-strings.patch index 61605fc81..510030852 100644 --- a/Bukkit-Patches/0024-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/Bukkit-Patches/0024-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From 0c6e10446a706e18998b904c3215b78189137f58 Mon Sep 17 00:00:00 2001 +From 36b136881620915be2a5eb039c3a9b8c1dc0861b Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:22:26 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/Bukkit-Patches/0025-Add-Score.isScoreSet-Z-API.patch b/Bukkit-Patches/0025-Add-Score.isScoreSet-Z-API.patch index 3991dcd03..8b2658a96 100644 --- a/Bukkit-Patches/0025-Add-Score.isScoreSet-Z-API.patch +++ b/Bukkit-Patches/0025-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From 2dd486923aa364890c40ab072b20bd601d038431 Mon Sep 17 00:00:00 2001 +From 396a8869eb8e9de9089637b76a71234c02d1fdf2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:13 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/Bukkit-Patches/0026-Add-PlayerSpawnLocationEvent.patch b/Bukkit-Patches/0026-Add-PlayerSpawnLocationEvent.patch index 31298710d..6005f597b 100644 --- a/Bukkit-Patches/0026-Add-PlayerSpawnLocationEvent.patch +++ b/Bukkit-Patches/0026-Add-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From 385b88204bd3697d77df216b85eae5000c1aefd7 Mon Sep 17 00:00:00 2001 +From c3183b435807fa97baad65b698066e9a15a2ae47 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:01:32 +0200 Subject: [PATCH] Add PlayerSpawnLocationEvent. diff --git a/Bukkit-Patches/0027-Ease-ClassLoader-Deadlocks-Where-Possible.patch b/Bukkit-Patches/0027-Ease-ClassLoader-Deadlocks-Where-Possible.patch index 5b4b279b3..02a99485f 100644 --- a/Bukkit-Patches/0027-Ease-ClassLoader-Deadlocks-Where-Possible.patch +++ b/Bukkit-Patches/0027-Ease-ClassLoader-Deadlocks-Where-Possible.patch @@ -1,4 +1,4 @@ -From a1f943c6a96039f0c32d66840c7733d34eab815f Mon Sep 17 00:00:00 2001 +From 7b22f91f252d08fdad9c53a669f51356fb34db71 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Jul 2014 17:24:21 +1000 Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible @@ -6,7 +6,7 @@ Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible When on Java 7 we can register the classloader as parallel capable to prevent deadlocks caused by certain scenarios. Due to the nature of PluginClassLoader this isn't completely safe, but we can make it safer by switching to concurrency focused collections. Either way this is far better than crashing the server. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 3e60a7b..5a57379 100644 +index b081ecb..0ac8325 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -48,7 +48,7 @@ import org.yaml.snakeyaml.error.YAMLException; diff --git a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch index 526bb60ac..aa5f3103d 100644 --- a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch +++ b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch @@ -1,4 +1,4 @@ -From 6ba7952d089c68b5441f201bcac309c1c57a2d4c Mon Sep 17 00:00:00 2001 +From e127c24f68c61577500ba258b36373e659b261a7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 22 Jul 2014 21:01:32 +1000 Subject: [PATCH] Fix slow tab complete for some commands. diff --git a/Bukkit-Patches/0029-Undeprecate-Player-updateInventory-V.patch b/Bukkit-Patches/0029-Undeprecate-Player-updateInventory-V.patch index 04c1312ef..79d6947f6 100644 --- a/Bukkit-Patches/0029-Undeprecate-Player-updateInventory-V.patch +++ b/Bukkit-Patches/0029-Undeprecate-Player-updateInventory-V.patch @@ -1,14 +1,14 @@ -From 31ac5fc27218ece6f6ae7f493bf8aede012c72ca Mon Sep 17 00:00:00 2001 +From f8e416af1d4903c5086910c7325987dfaac2d619 Mon Sep 17 00:00:00 2001 From: drXor Date: Wed, 23 Jul 2014 15:50:36 -0400 Subject: [PATCH] Undeprecate Player#updateInventory()V diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 37c8a58..b2ad5b7 100644 +index 7ed0f6a..b55d70e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -333,10 +333,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -334,10 +334,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Forces an update of the player's entire inventory. * diff --git a/Bukkit-Patches/0030-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/Bukkit-Patches/0030-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 180697755..3baa9b42c 100644 --- a/Bukkit-Patches/0030-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/Bukkit-Patches/0030-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,11 +1,11 @@ -From 061fe4dee6e1a5f670bf8fb4d522fd46c81e2786 Mon Sep 17 00:00:00 2001 +From 203a3470d214613a5d1f979290dfc71c308f9596 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:31:04 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 397ba11..9ae3e4c 100644 +index 00f71ce..d560bb2 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -124,6 +124,34 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { diff --git a/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch b/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch deleted file mode 100644 index 1da81ef43..000000000 --- a/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 83e927d3f63812b935f753935940351b16b9ba34 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Mon, 1 Sep 2014 19:36:20 +1000 -Subject: [PATCH] Skip loading of plugins which are not 1.8 compatible. - -As they do not work with Spigot 1.8 builds! - -diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 1d51908..b3002e8 100644 ---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java -+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -@@ -132,6 +132,13 @@ public final class SimplePluginManager implements PluginManager { - try { - description = loader.getPluginDescription(file); - String name = description.getName(); -+ // Spigot Start -+ if ( name.equalsIgnoreCase( "Orebfuscator" ) ) -+ { -+ server.getLogger().log( Level.WARNING, "Skipping loading of Orebfuscator as it does not work with Spigot 1.8 builds!" ); -+ continue; -+ } -+ // Spigot End - if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) { - server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': Restricted Name"); - continue; --- -2.1.0 - diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index ecb612c30..4c97552d2 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From a648a0a8b0e53cc753bb37b9a34e7fee8600a977 Mon Sep 17 00:00:00 2001 +From 34268f62473dec95944b065b2d62e82aab2a2464 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index 089e2ad12..c810b906d 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From fef5885eb9ba89075b623d31b95da768e078aa0c Mon Sep 17 00:00:00 2001 +From aaca00016118455bba4debef407285ea185d2695 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 45f246e7c..9895e76c4 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 4f493e30fb31c21faae3c325034835f25752e915 Mon Sep 17 00:00:00 2001 +From eccaca086e9cc6a04bb6469e0f3ec167f9121fee Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f2a78c1..c20a2d5 100644 +index fa1fe20..fb21e5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1620,4 +1620,14 @@ public final class CraftServer implements Server { +@@ -1625,4 +1625,14 @@ public final class CraftServer implements Server { public UnsafeValues getUnsafe() { return CraftMagicNumbers.INSTANCE; } @@ -104,7 +104,7 @@ index 64e346d..243e8e5 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 286a58c..fb07b7d 100644 +index 0f0e160..acd6a34 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1309,4 +1309,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch index 9a966239c..7f63b9787 100644 --- a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch +++ b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch @@ -1,4 +1,4 @@ -From 930d80ace4fb089739b570ddcd2bc247281aa2b4 Mon Sep 17 00:00:00 2001 +From 29a756575eaff194e5a3759084883c683ab1d4e6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 10:38:04 +1000 Subject: [PATCH] Obfuscation Helpers @@ -6,7 +6,7 @@ Subject: [PATCH] Obfuscation Helpers Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c12b192..586123c 100644 +index 2422a5f..7224ee6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1298,6 +1298,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index e74b51a76..8dcecd942 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 281c065d2ecfa8d09a07ca862d585ef02ae2ea7c Mon Sep 17 00:00:00 2001 +From cba0ed7de061f5e3becddd0f9db58437454371c7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -35,10 +35,10 @@ index 29c0a34..424b71d 100644 if (!this.getOnlineMode()) { DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0767445..94463a4 100644 +index f45bf54..130c54d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -85,6 +85,7 @@ public abstract class World implements IBlockAccess { +@@ -98,6 +98,7 @@ public abstract class World implements IBlockAccess { public long ticksPerMonsterSpawns; public boolean populating; private int tickPosition; @@ -46,7 +46,7 @@ index 0767445..94463a4 100644 public CraftWorld getWorld() { return this.world; -@@ -99,6 +100,7 @@ public abstract class World implements IBlockAccess { +@@ -112,6 +113,7 @@ public abstract class World implements IBlockAccess { } protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) { @@ -55,7 +55,7 @@ index 0767445..94463a4 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 c20a2d5..ff9efe9 100644 +index fb21e5b..50a44f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -245,8 +245,10 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch index 74add3bc2..4f6106ff8 100644 --- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch @@ -1,4 +1,4 @@ -From 62ad744472fdb9885c06d58f0ef5a47652b88d50 Mon Sep 17 00:00:00 2001 +From 0b4a7be15ef20fd9da2461d422aa8375d8916185 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:56:02 +1000 Subject: [PATCH] Better Chunk Tick Selection @@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection An optimized chunk ticking algorithm which better selects chunks around players which are active on the server. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 94463a4..a01da14 100644 +index 130c54d..9a218e4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -64,7 +64,7 @@ public abstract class World implements IBlockAccess { @@ -18,7 +18,7 @@ index 94463a4..a01da14 100644 private int K; public boolean allowMonsters; public boolean allowAnimals; -@@ -85,6 +85,31 @@ public abstract class World implements IBlockAccess { +@@ -98,6 +98,31 @@ public abstract class World implements IBlockAccess { public long ticksPerMonsterSpawns; public boolean populating; private int tickPosition; @@ -50,7 +50,7 @@ index 94463a4..a01da14 100644 public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot public CraftWorld getWorld() { -@@ -106,6 +131,11 @@ public abstract class World implements IBlockAccess { +@@ -119,6 +144,11 @@ public abstract class World implements IBlockAccess { this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit // CraftBukkit end @@ -62,7 +62,7 @@ index 94463a4..a01da14 100644 this.K = this.random.nextInt(12000); this.allowMonsters = true; -@@ -1884,17 +1914,44 @@ public abstract class World implements IBlockAccess { +@@ -1897,17 +1927,44 @@ public abstract class World implements IBlockAccess { int k; int l; diff --git a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch index fe48384fc..12ed769bb 100644 --- a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From 9a1a0d43423b68c8c3a2e36b44d4a4aa47b3b866 Mon Sep 17 00:00:00 2001 +From 46825f35d92e4d5d2075470c0c17005e35ca6b13 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:17:20 +1000 Subject: [PATCH] Crop Growth Rates diff --git a/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch index 706a99fd8..cd94f38ae 100644 --- a/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch +++ b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch @@ -1,4 +1,4 @@ -From 6d0c5cae337957d4c1b3d8b5ff8eb01385433532 Mon Sep 17 00:00:00 2001 +From 0c6626c35833657924083433faabd8d7279dce79 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:09:45 +1000 Subject: [PATCH] More Efficient Chunk Save Queue @@ -6,7 +6,7 @@ Subject: [PATCH] More Efficient Chunk Save Queue Optimizes the data structures behind the chunk save queue into ones more suitable for the type of data and access which they are used for. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index a5175fd..9ab0b5e 100644 +index 527ab42..33bb889 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -15,8 +15,11 @@ import org.apache.logging.log4j.Logger; diff --git a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch index feb2bc52f..b92d64724 100644 --- a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From e9147b159cf2d57870d56030b3f0a9c7f803f3fa Mon Sep 17 00:00:00 2001 +From 7d95080c00f83f2c05ca97cb44c43ce0d867c5c1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -41,10 +41,10 @@ index e2c0712..7f16401 100644 } } else { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a01da14..4cd59aa 100644 +index 9a218e4..6b53f5b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -908,6 +908,23 @@ public abstract class World implements IBlockAccess { +@@ -921,6 +921,23 @@ public abstract class World implements IBlockAccess { // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead event = CraftEventFactory.callProjectileLaunchEvent(entity); } diff --git a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch index b712f276a..56beb66fd 100644 --- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 9e5facb25e4f5cd1aefa2709f65a6b3b54f69f12 Mon Sep 17 00:00:00 2001 +From bf458c840cda852fece98340e8529e55cf21cb3b Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -66,10 +66,10 @@ index 7c58740..f5d518f 100644 this.trackedPlayers.remove(entityplayer); entityplayer.d(this.tracker); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4cd59aa..a16be9b 100644 +index 6b53f5b..69e78b8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -878,6 +878,7 @@ public abstract class World implements IBlockAccess { +@@ -891,6 +891,7 @@ public abstract class World implements IBlockAccess { } public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason @@ -77,7 +77,7 @@ index 4cd59aa..a16be9b 100644 if (entity == null) return false; // CraftBukkit end int i = MathHelper.floor(entity.locX / 16.0D); -@@ -985,6 +986,7 @@ public abstract class World implements IBlockAccess { +@@ -998,6 +999,7 @@ public abstract class World implements IBlockAccess { } public void removeEntity(Entity entity) { @@ -85,7 +85,7 @@ index 4cd59aa..a16be9b 100644 entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); -@@ -2410,6 +2412,7 @@ public abstract class World implements IBlockAccess { +@@ -2423,6 +2425,7 @@ public abstract class World implements IBlockAccess { } public void b(Collection collection) { @@ -122,7 +122,7 @@ index 17d24ce..a45f2a3 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 fb07b7d..01b1822 100644 +index acd6a34..a0df1d2 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 { diff --git a/CraftBukkit-Patches/0011-View-Distance.patch b/CraftBukkit-Patches/0011-View-Distance.patch index fc3ba6366..6715287f5 100644 --- a/CraftBukkit-Patches/0011-View-Distance.patch +++ b/CraftBukkit-Patches/0011-View-Distance.patch @@ -1,4 +1,4 @@ -From 5ade27e51b2ffa3362e42dfba15d1b40a28847a9 Mon Sep 17 00:00:00 2001 +From 2d77781735f24206efabc85b2686de7ffe8ee94b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance diff --git a/CraftBukkit-Patches/0012-Spigot-Timings.patch b/CraftBukkit-Patches/0012-Spigot-Timings.patch index ee1860f37..304d32314 100644 --- a/CraftBukkit-Patches/0012-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 0ebc78268112f256eabea7219e1bd2921fd2b3a8 Mon Sep 17 00:00:00 2001 +From 4e94a503c9de92d30489655ea3affe5c577459ec Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -56,7 +56,7 @@ index a363af7..9ee7e75 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 9ab0b5e..1eea51c 100644 +index 33bb889..7caddb5 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -45,7 +45,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -69,7 +69,7 @@ index 9ab0b5e..1eea51c 100644 if (data != null) { Chunk chunk = (Chunk) data[0]; NBTTagCompound nbttagcompound = (NBTTagCompound) data[1]; -@@ -381,6 +383,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -400,6 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) { // CraftBukkit end @@ -77,7 +77,7 @@ index 9ab0b5e..1eea51c 100644 NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10); if (nbttaglist1 != null) { -@@ -406,7 +409,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -425,7 +428,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } } } @@ -87,7 +87,7 @@ index 9ab0b5e..1eea51c 100644 NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10); if (nbttaglist2 != null) { -@@ -419,6 +423,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -438,6 +442,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } } } @@ -96,7 +96,7 @@ index 9ab0b5e..1eea51c 100644 if (nbttagcompound.hasKeyOfType("TileTicks", 9)) { NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10); -@@ -438,6 +444,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -457,6 +463,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } } } @@ -242,7 +242,7 @@ index 0aaee5f..803b5df 100644 this.world.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 586123c..ab31862 100644 +index 7224ee6..7d3b218 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -45,6 +45,7 @@ import joptsimple.OptionSet; @@ -253,7 +253,7 @@ index 586123c..ab31862 100644 import org.bukkit.craftbukkit.util.Waitable; import org.bukkit.event.server.RemoteServerCommandEvent; import org.bukkit.event.world.WorldSaveEvent; -@@ -587,6 +588,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -589,6 +590,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs protected void x() {} protected void y() throws ExceptionWorldConflict { // CraftBukkit - added throws @@ -261,7 +261,7 @@ index 586123c..ab31862 100644 long i = System.nanoTime(); ++this.ticks; -@@ -613,10 +615,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -615,10 +617,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs } if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit @@ -274,7 +274,7 @@ index 586123c..ab31862 100644 } this.methodProfiler.a("tallying"); -@@ -633,6 +637,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -635,6 +639,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.methodProfiler.b(); this.methodProfiler.b(); @@ -283,7 +283,7 @@ index 586123c..ab31862 100644 } public void z() { -@@ -651,16 +657,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -653,16 +659,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.methodProfiler.c("levels"); @@ -307,7 +307,7 @@ index 586123c..ab31862 100644 // Send time updates to everyone, it will get the right time from the world the player is in. if (this.ticks % 20 == 0) { for (int i = 0; i < this.getPlayerList().players.size(); ++i) { -@@ -668,6 +681,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -670,6 +683,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time } } @@ -315,7 +315,7 @@ index 586123c..ab31862 100644 int i; -@@ -691,7 +705,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -693,7 +707,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs CrashReport crashreport; try { @@ -325,7 +325,7 @@ index 586123c..ab31862 100644 } catch (Throwable throwable1) { crashreport = CrashReport.a(throwable1, "Exception ticking world"); worldserver.a(crashreport); -@@ -699,7 +715,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -701,7 +717,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs } try { @@ -335,7 +335,7 @@ index 586123c..ab31862 100644 } catch (Throwable throwable2) { crashreport = CrashReport.a(throwable2, "Exception ticking world entities"); worldserver.a(crashreport); -@@ -708,7 +726,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -710,7 +728,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.methodProfiler.b(); this.methodProfiler.a("tracker"); @@ -345,7 +345,7 @@ index 586123c..ab31862 100644 this.methodProfiler.b(); this.methodProfiler.b(); // } // CraftBukkit -@@ -717,14 +737,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -719,14 +739,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs } this.methodProfiler.c("connection"); @@ -367,7 +367,7 @@ index 586123c..ab31862 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9c7c2bd..47ecfdd 100644 +index 17c5e38..c7d4f9f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1009,6 +1009,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -420,7 +420,7 @@ index ec76148..a93ad27 100644 private static Map f = Maps.newHashMap(); private static Map g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a16be9b..5fc707f 100644 +index 69e78b8..d67f2eb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,6 +18,7 @@ import org.bukkit.Bukkit; @@ -431,7 +431,7 @@ index a16be9b..5fc707f 100644 import org.bukkit.generator.ChunkGenerator; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; -@@ -112,6 +113,8 @@ public abstract class World implements IBlockAccess { +@@ -125,6 +126,8 @@ public abstract class World implements IBlockAccess { public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot @@ -440,7 +440,7 @@ index a16be9b..5fc707f 100644 public CraftWorld getWorld() { return this.world; } -@@ -149,6 +152,7 @@ public abstract class World implements IBlockAccess { +@@ -162,6 +165,7 @@ public abstract class World implements IBlockAccess { this.M = worldprovider.getWorldBorder(); this.getServer().addWorld(this.world); // CraftBukkit @@ -448,7 +448,7 @@ index a16be9b..5fc707f 100644 } public World b() { -@@ -1239,6 +1243,7 @@ public abstract class World implements IBlockAccess { +@@ -1252,6 +1256,7 @@ public abstract class World implements IBlockAccess { this.g.clear(); this.methodProfiler.c("regular"); @@ -456,7 +456,7 @@ index a16be9b..5fc707f 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); -@@ -1255,7 +1260,9 @@ public abstract class World implements IBlockAccess { +@@ -1268,7 +1273,9 @@ public abstract class World implements IBlockAccess { this.methodProfiler.a("tick"); if (!entity.dead) { try { @@ -466,7 +466,7 @@ index a16be9b..5fc707f 100644 } catch (Throwable throwable1) { crashreport = CrashReport.a(throwable1, "Ticking entity"); crashreportsystemdetails = crashreport.a("Entity being ticked"); -@@ -1280,7 +1287,9 @@ public abstract class World implements IBlockAccess { +@@ -1293,7 +1300,9 @@ public abstract class World implements IBlockAccess { this.methodProfiler.b(); } @@ -476,7 +476,7 @@ index a16be9b..5fc707f 100644 this.L = true; // CraftBukkit start - From below, clean up tile entities before ticking them if (!this.b.isEmpty()) { -@@ -1300,6 +1309,7 @@ public abstract class World implements IBlockAccess { +@@ -1313,6 +1322,7 @@ public abstract class World implements IBlockAccess { if (this.isLoaded(blockposition) && this.M.a(blockposition)) { try { @@ -484,7 +484,7 @@ index a16be9b..5fc707f 100644 ((IUpdatePlayerListBox) tileentity).c(); } catch (Throwable throwable2) { CrashReport crashreport1 = CrashReport.a(throwable2, "Ticking block entity"); -@@ -1308,6 +1318,11 @@ public abstract class World implements IBlockAccess { +@@ -1321,6 +1331,11 @@ public abstract class World implements IBlockAccess { tileentity.a(crashreportsystemdetails1); throw new ReportedException(crashreport1); } @@ -496,7 +496,7 @@ index a16be9b..5fc707f 100644 } } -@@ -1320,6 +1335,8 @@ public abstract class World implements IBlockAccess { +@@ -1333,6 +1348,8 @@ public abstract class World implements IBlockAccess { } } @@ -505,7 +505,7 @@ index a16be9b..5fc707f 100644 this.L = false; /* CraftBukkit start - Moved up if (!this.b.isEmpty()) { -@@ -1352,6 +1369,7 @@ public abstract class World implements IBlockAccess { +@@ -1365,6 +1382,7 @@ public abstract class World implements IBlockAccess { this.a.clear(); } @@ -513,7 +513,7 @@ index a16be9b..5fc707f 100644 this.methodProfiler.b(); this.methodProfiler.b(); } -@@ -1396,6 +1414,7 @@ public abstract class World implements IBlockAccess { +@@ -1409,6 +1427,7 @@ public abstract class World implements IBlockAccess { // CraftBukkit start - Use neighbor cache instead of looking up Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4); if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.isAreaLoaded(i - b0, 0, j - b0, i + b0, 0, j + b0) */) { @@ -521,7 +521,7 @@ index a16be9b..5fc707f 100644 // CraftBukkit end entity.P = entity.locX; entity.Q = entity.locY; -@@ -1459,6 +1478,7 @@ public abstract class World implements IBlockAccess { +@@ -1472,6 +1491,7 @@ public abstract class World implements IBlockAccess { } } @@ -584,10 +584,10 @@ index f34b76e..9012c9e 100644 public BiomeMeta a(EnumCreatureType enumcreaturetype, BlockPosition blockposition) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ff9efe9..0d23ec1 100644 +index 50a44f4..9d3d76e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1630,6 +1630,11 @@ public final class CraftServer implements Server { +@@ -1635,6 +1635,11 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch index a94627306..02cfc5b27 100644 --- a/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From bc6052de701c26b98da0e84539c029dfadd6b153 Mon Sep 17 00:00:00 2001 +From b9b5a6c0add6253d7f4d79849542708bf3bc18c0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:29:54 +1000 Subject: [PATCH] Fix Mob Spawning Relative to View Distance diff --git a/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch index dc9fbc877..cfb4c5587 100644 --- a/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch @@ -1,14 +1,14 @@ -From 0c10eb34353da6d37510534f7747584e8b45d470 Mon Sep 17 00:00:00 2001 +From 7e74340c7f79f3945ef71669e7366b33e5e632db Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Handle Null Tile Entities diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5fc707f..974daf4 100644 +index d67f2eb..9cb7ab8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1303,6 +1303,13 @@ public abstract class World implements IBlockAccess { +@@ -1316,6 +1316,13 @@ public abstract class World implements IBlockAccess { while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); diff --git a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch index 68e3800ef..ce38496f3 100644 --- a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From f1ac20811c2a33c2149c56883af5fabb560fa65c Mon Sep 17 00:00:00 2001 +From af62d64b9a60038edfe602295049b4c11baf40a1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -155,10 +155,10 @@ index 803b5df..86474de 100644 public void G() { this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 974daf4..076b4fc 100644 +index 9cb7ab8..aa6d407 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1243,6 +1243,7 @@ public abstract class World implements IBlockAccess { +@@ -1256,6 +1256,7 @@ public abstract class World implements IBlockAccess { this.g.clear(); this.methodProfiler.c("regular"); @@ -166,7 +166,7 @@ index 974daf4..076b4fc 100644 timings.entityTick.startTiming(); // Spigot // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { -@@ -1418,9 +1419,11 @@ public abstract class World implements IBlockAccess { +@@ -1431,9 +1432,11 @@ public abstract class World implements IBlockAccess { int j = MathHelper.floor(entity.locZ); byte b0 = 32; diff --git a/CraftBukkit-Patches/0016-Metrics.patch b/CraftBukkit-Patches/0016-Metrics.patch index 02c594a4e..9f8af0e37 100644 --- a/CraftBukkit-Patches/0016-Metrics.patch +++ b/CraftBukkit-Patches/0016-Metrics.patch @@ -1,4 +1,4 @@ -From 74c8d363f218b601d7059aa9cbc546f9da0c0db9 Mon Sep 17 00:00:00 2001 +From 4787b7b00753364412d162f25dfadbe1da207c55 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics diff --git a/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch index 2223e5415..4f56cac7c 100644 --- a/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From cb6f24f19cbd3a6f2a337b8228d32b749bc7216e Mon Sep 17 00:00:00 2001 +From 7c574b4c66f3561cbfc8cfab2d5e40c8d6a595e1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch index fbf57be20..1064affaa 100644 --- a/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From a2ee07d7ddf431e275dec7fb6279daf63433aeb7 Mon Sep 17 00:00:00 2001 +From 5bc259a6567c04944c072dd5866eb94606b34741 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 18 Mar 2013 20:01:44 +1100 Subject: [PATCH] Prevent NPE in CraftSign diff --git a/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch index 388701c5d..b4a52a669 100644 --- a/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 5933e32258ce700258244a95c28a6e1e3f3ad89d Mon Sep 17 00:00:00 2001 +From 255ca1791eb25f3ae3dc98a48cdebe11e6437c48 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges diff --git a/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch index 4ba7e4a15..ceec9470e 100644 --- a/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From fbba0bd76ebbcd4d2ba2ecafd0e91f1a040095d6 Mon Sep 17 00:00:00 2001 +From 8fe787a19b0fd8fea847c4bec826f8be60af91a7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:50:27 +1000 Subject: [PATCH] Thread Naming and Tweaks diff --git a/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch index e43510800..d7ae43fab 100644 --- a/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From 75800d61cf22442d4d1bc93c1f236af83a4d4998 Mon Sep 17 00:00:00 2001 +From e95361cd8ad19c073e62e7f7048a4616bdd65708 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files @@ -18,10 +18,10 @@ index f4f72ef..1b03878 100644 public static synchronized RegionFile a(File file, int i, int j) { File file1 = new File(file, "region"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0d23ec1..2da23eb 100644 +index 9d3d76e..ff06c34 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -945,6 +945,31 @@ public final class CraftServer implements Server { +@@ -950,6 +950,31 @@ public final class CraftServer implements Server { worlds.remove(world.getName().toLowerCase()); console.worlds.remove(console.worlds.indexOf(handle)); diff --git a/CraftBukkit-Patches/0022-Remove-o-Option.patch b/CraftBukkit-Patches/0022-Remove-o-Option.patch index a99c9bced..6172cf5f6 100644 --- a/CraftBukkit-Patches/0022-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0022-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From a47d75e84a1dc350dd415a8c5db259cfa328c253 Mon Sep 17 00:00:00 2001 +From 173a71adcf42c8dc373c9a2399eb4a0410915efc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option diff --git a/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch index c14734cb5..3a19edc81 100644 --- a/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From c1f5c0814bd607378cbbefe75da2700a888106ee Mon Sep 17 00:00:00 2001 +From e62dd23291bb93bbfa318a7fcb14265d515e77b9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 1 Jun 2013 16:34:38 +1000 Subject: [PATCH] Recipe Deconstruction diff --git a/CraftBukkit-Patches/0024-Implement-Arrow-API.patch b/CraftBukkit-Patches/0024-Implement-Arrow-API.patch index 19b608f84..4ce025c37 100644 --- a/CraftBukkit-Patches/0024-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0024-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From 8e4326ea42b4006f8f38bd9f3023560dfe9f7a55 Mon Sep 17 00:00:00 2001 +From 6f2d10b520824fb018ee8d27022b0e47f9fc5c4c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:16:05 +1000 Subject: [PATCH] Implement Arrow API diff --git a/CraftBukkit-Patches/0025-Hopper-Customisations.patch b/CraftBukkit-Patches/0025-Hopper-Customisations.patch index a6253bc43..4f57edf92 100644 --- a/CraftBukkit-Patches/0025-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0025-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From 6e47263580456c9da8b556515c903cbfbbdf8c88 Mon Sep 17 00:00:00 2001 +From d446a15e50696cb19528308e5a7f0f8b95fde33d Mon Sep 17 00:00:00 2001 From: erocs Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations diff --git a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch index a73d7dc74..f77daf2c6 100644 --- a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From d0f19a283206f07de4ce8eaa985ad0a9a38d3b2f Mon Sep 17 00:00:00 2001 +From d6637fb358b0354ead60a507e50010e09cfcb348 Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:37 -0500 Subject: [PATCH] Implement SpawnerSpawnEvent. diff --git a/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch index 7c82c6b5a..889791a20 100644 --- a/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch +++ b/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch @@ -1,4 +1,4 @@ -From 72b3a001f6613cdfd324897004a0c3a2ea87d95a Mon Sep 17 00:00:00 2001 +From 6bf639a2025d60282de7a822ba0bf148f71dd59a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 15 Jun 2013 21:34:48 +1000 Subject: [PATCH] Firework Meta Crash Fix diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch index 82a692f02..c48f2b7bc 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch @@ -1,11 +1,11 @@ -From b2a198ade17a9e1d3f8afdf16efd2d308a204398 Mon Sep 17 00:00:00 2001 +From 7efe54f5803c0ccec23d7b5da399a23080cd8efc Mon Sep 17 00:00:00 2001 From: md_5 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 47ecfdd..e21bed0 100644 +index c7d4f9f..1160b6e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1012,6 +1012,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch index cb36f9ed1..b089c8bf6 100644 --- a/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch @@ -1,14 +1,14 @@ -From 3219a5db66508a6996bd785c66421f7446214209 Mon Sep 17 00:00:00 2001 +From 938bb2bbecbdca581826bcc17c4611890027e65f Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2da23eb..463c0d8 100644 +index ff06c34..f9f5056 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1549,6 +1549,13 @@ public final class CraftServer implements Server { +@@ -1554,6 +1554,13 @@ public final class CraftServer implements Server { } public List tabCompleteCommand(Player player, String message) { diff --git a/CraftBukkit-Patches/0030-Configurable-Messages.patch b/CraftBukkit-Patches/0030-Configurable-Messages.patch index 758ff6412..34348db73 100644 --- a/CraftBukkit-Patches/0030-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0030-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From 81b044be2a6583f986e9c9d0f08ef51a57883e66 Mon Sep 17 00:00:00 2001 +From ba993a3c58235d8d8b949adb280788cafe9880e1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages @@ -45,7 +45,7 @@ index 5e882cc..2b8a3e5 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 463c0d8..0741d7b 100644 +index f9f5056..537932a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -626,11 +626,7 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch index dc04e30ad..c5064b27d 100644 --- a/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,4 +1,4 @@ -From 0945d83063d51846a2cd6b8043c59baa3c6abff0 Mon Sep 17 00:00:00 2001 +From db55ab7f90f09b34ed44ccc65d553e62a764433c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:12:02 +1000 Subject: [PATCH] Allow Disabling of Random Lighting Updates @@ -18,10 +18,10 @@ index c3059b6..9e9ea23 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 076b4fc..9b4e05a 100644 +index aa6d407..7c058fc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2009,7 +2009,7 @@ public abstract class World implements IBlockAccess { +@@ -2022,7 +2022,7 @@ public abstract class World implements IBlockAccess { } this.methodProfiler.a("playerCheckLight"); diff --git a/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch index 806cd798c..c43012dbe 100644 --- a/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From db18a4785b18daf00b86c88fd4dc0d32eebb5df3 Mon Sep 17 00:00:00 2001 +From 86bf7d4be1de5bc6ede793017ce722684427e1ea Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 27 Jun 2013 17:26:09 +1000 Subject: [PATCH] Properly Close Inventories diff --git a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch index aed35b23c..8a4177a2f 100644 --- a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch @@ -1,14 +1,14 @@ -From c7e3163a08a3797e61608ac9fcbbdf5ebfd34ba2 Mon Sep 17 00:00:00 2001 +From 148863cb57e94a6063ffaeebd8c321f8807d01dc Mon Sep 17 00:00:00 2001 From: md_5 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 e21bed0..2bf9f49 100644 +index 1160b6e..5e5e6ba 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1147,6 +1147,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1146,6 +1146,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u()); WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); Entity entity = packetplayinuseentity.a((World) worldserver); diff --git a/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch index c7de190c3..7f5be2536 100644 --- a/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From 39908f7095fd34b8ce478c42808bd83747fcafcc Mon Sep 17 00:00:00 2001 +From 2b8bc08ea51b342aeb3715295abe0373d91e0a40 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:49 +1000 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch index e4730b778..638e74a89 100644 --- a/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From d2347b2bad3317dcd6774c60255af50c18ffbf49 Mon Sep 17 00:00:00 2001 +From 39457860e637dd33e23a801f73808afb4f62a496 Mon Sep 17 00:00:00 2001 From: Alex Ciuba Date: Tue, 11 Jun 2013 15:23:03 -0400 Subject: [PATCH] Prevent Ghost Players Caused by Plugins diff --git a/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch index c839315ee..107d52098 100644 --- a/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch +++ b/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch @@ -1,4 +1,4 @@ -From cb4abf0876742f68cb52fa57d0f05eef21de148f Mon Sep 17 00:00:00 2001 +From 98ae2b148bb59c9af8619cfcf7f592864ca90645 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:02:59 +1000 Subject: [PATCH] Plug World Unload Memory Leak diff --git a/CraftBukkit-Patches/0037-Player-Collision-API.patch b/CraftBukkit-Patches/0037-Player-Collision-API.patch index 139b415ee..8522054cc 100644 --- a/CraftBukkit-Patches/0037-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0037-Player-Collision-API.patch @@ -1,11 +1,11 @@ -From 34960664e3295fc6a2dde8148d5984d185fda497 Mon Sep 17 00:00:00 2001 +From 9c7a158367c21ce04eab04c353170509b4a01534 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 7c47e5b..6e9354f 100644 +index 7635555..87356e4 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -425,6 +425,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -38,7 +38,7 @@ index 86474de..6358f5e 100644 Entity entity = (Entity) list.get(i); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index dc7654a..3bc77ae 100644 +index 8d0fc36..d8c8151 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -64,7 +64,7 @@ index dc7654a..3bc77ae 100644 public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) { super(worldserver, gameprofile); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 01b1822..984bea1 100644 +index a0df1d2..88c45f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1314,6 +1314,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch index b93ed92c4..168e72f6e 100644 --- a/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch +++ b/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch @@ -1,14 +1,14 @@ -From 900e9db269b400872ce1388c48c21879deeb0ebf Mon Sep 17 00:00:00 2001 +From 6627cc2177ad9e1991e1c595c894e5b441dce6f9 Mon Sep 17 00:00:00 2001 From: agentk20 Date: Sat, 3 Aug 2013 19:28:48 +1000 Subject: [PATCH] Fully Disable Snooper When Not Required diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ab31862..1d67c07 100644 +index 7d3b218..2c39a80 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -627,11 +627,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -629,11 +629,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.g[this.ticks % 100] = System.nanoTime() - i; this.methodProfiler.b(); this.methodProfiler.a("snooper"); diff --git a/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch index f90626e70..a1606acbc 100644 --- a/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From 680b66ad471af5c09814c9c3495f6eb10e779fad Mon Sep 17 00:00:00 2001 +From 78d9aa55fcc0bc2b2184e739d98d161933be842d Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sat, 3 Aug 2013 19:53:48 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch index cdf8d3fb2..f3636800a 100644 --- a/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch @@ -1,11 +1,11 @@ -From caacb61f2c1776f5d877fff024bab374ddf178f0 Mon Sep 17 00:00:00 2001 +From 474b8e425e75d6931365c37f04a04adecc5df970 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 984bea1..bf9dd99 100644 +index 88c45f1..6bdf188 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1178,7 +1178,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch index 90294df1e..a981f1738 100644 --- a/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch +++ b/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch @@ -1,11 +1,11 @@ -From e410f14442e2f20e4e6e8e0359a3fb4a22389c0e Mon Sep 17 00:00:00 2001 +From c4d1d49d376f4b935dad6b931e196f07ecebec88 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/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 6e9354f..0844b60 100644 +index 87356e4..d8adce0 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -298,6 +298,10 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index 1ca1d95e4..69691ab0b 100644 --- a/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From 278e9ad5469a08b0ad4b7a5b023361c7f7fad92d Mon Sep 17 00:00:00 2001 +From 17b8ffe2da66b3b20f4f94f1501b9b1fc074fef6 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/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch index 5fa050837..616195608 100644 --- a/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From 55d876c1cefd9c7fe8b7959d7af94435bfd60fd6 Mon Sep 17 00:00:00 2001 +From e24ed94388631dd27adbceae9f42beef808fee1f 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 diff --git a/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch index f48e3c522..ba0b6a8e0 100644 --- a/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 97da24a6e7b5d85dbd82820807708f1962e68b2f Mon Sep 17 00:00:00 2001 +From 7095785388e597a8ffd61ae0358bfcc0d6aa325b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Sep 2013 19:10:53 +1000 Subject: [PATCH] Item Despawn Rate diff --git a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch index 5a3ea82d4..9621d6733 100644 --- a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch @@ -1,11 +1,11 @@ -From 206178759589ab1942cda1d8aa21a3336f1fd7b8 Mon Sep 17 00:00:00 2001 +From ed75400b59931091386cd89f497a626717e1f026 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2bf9f49..6ffce8f 100644 +index 5e5e6ba..03f6b05 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 diff --git a/CraftBukkit-Patches/0046-Implement-respawn-API.patch b/CraftBukkit-Patches/0046-Implement-respawn-API.patch index 0dba6ae68..034581ce9 100644 --- a/CraftBukkit-Patches/0046-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0046-Implement-respawn-API.patch @@ -1,11 +1,11 @@ -From ed784d4bf689c5e60c333806b8b63bf4334160d3 Mon Sep 17 00:00:00 2001 +From e4c6e599c1e8c3d4d22b638596a6b72981bbd29e Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:34:49 +0200 Subject: [PATCH] Implement respawn API. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bf9dd99..494c0bc 100644 +index 6bdf188..26e77d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1327,6 +1327,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch index e5177a11c..dd29f8ad9 100644 --- a/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 14530ddad995a1001d4434971234b7a8ea765823 Mon Sep 17 00:00:00 2001 +From d10d9936aef229648a523a1b8ccba61ce4f4b9da Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Oct 2013 19:20:10 +1100 Subject: [PATCH] Arrow Despawn Rate diff --git a/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch index 892721e11..f3c115395 100644 --- a/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch +++ b/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch @@ -1,4 +1,4 @@ -From 6d6b5bcad06ca34d88abaa9cbeee95158d5925c6 Mon Sep 17 00:00:00 2001 +From fd5af4b22b2622488b43a72fe74f29d2ec0adcc4 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/0049-Watchdog-Thread.patch b/CraftBukkit-Patches/0049-Watchdog-Thread.patch index d6c610be2..f8abd95f9 100644 --- a/CraftBukkit-Patches/0049-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0049-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From d4b5d31d08c0240e5ce5e8104c84e377e872efbb Mon Sep 17 00:00:00 2001 +From 80cf3ea8dec4901f6ca9ec52b1cc93827b6e284f Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 5 Aug 2014 17:20:19 +0100 Subject: [PATCH] Watchdog Thread. @@ -18,10 +18,10 @@ index 390c6eb..240c909 100644 thread.setName("Server Watchdog"); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1d67c07..65c3a66 100644 +index 2c39a80..adbd92e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -537,6 +537,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -539,6 +539,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.a(crashreport); } finally { try { @@ -29,7 +29,7 @@ index 1d67c07..65c3a66 100644 this.stop(); this.isStopped = true; } catch (Throwable throwable1) { -@@ -637,6 +638,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -639,6 +640,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.methodProfiler.b(); this.methodProfiler.b(); @@ -39,7 +39,7 @@ index 1d67c07..65c3a66 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..429c258 +index 0000000..429c2580 --- /dev/null +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -0,0 +1,124 @@ diff --git a/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch index da19fd232..f483e501b 100644 --- a/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch +++ b/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch @@ -1,4 +1,4 @@ -From b3c989b0fb4d2fcdbf2f331c38e56ef1ce2e133f Mon Sep 17 00:00:00 2001 +From 28a5cdec41be4bb97141e21bfabf8e583e4a5970 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/0051-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch index 693ffb2ac..65b7b2846 100644 --- a/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,4 +1,4 @@ -From 6e90d5453c0852c00ea47ba024d83ceb728f8aa4 Mon Sep 17 00:00:00 2001 +From b21eab777645a11ea1aa708457f8529cfa12fd87 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/0052-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch index 7c97d6648..7ed7f053c 100644 --- a/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch @@ -1,4 +1,4 @@ -From 5b8767e1d3aacd236a1e081e450ee69c3391de28 Mon Sep 17 00:00:00 2001 +From 93ffd271994e903b983d5dd64811d4feb6c92f51 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/0053-Orebfuscator.patch b/CraftBukkit-Patches/0053-Orebfuscator.patch index 6a7071ef3..3a356093b 100644 --- a/CraftBukkit-Patches/0053-Orebfuscator.patch +++ b/CraftBukkit-Patches/0053-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 65eae3b8ffa2e0ee6f4242b90aa2df6fc8b24721 Mon Sep 17 00:00:00 2001 +From 0880b62865e0edb645d203f5189e37ae46293dd1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -91,10 +91,10 @@ index e6145ac..34c22d2 100644 public void a(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9b4e05a..045defc 100644 +index 7c058fc..d3ee73d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -445,6 +445,7 @@ public abstract class World implements IBlockAccess { +@@ -458,6 +458,7 @@ public abstract class World implements IBlockAccess { this.d(blockposition.up(), block); this.d(blockposition.north(), block); this.d(blockposition.south(), block); @@ -102,7 +102,7 @@ index 9b4e05a..045defc 100644 } public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) { -@@ -658,9 +659,16 @@ public abstract class World implements IBlockAccess { +@@ -671,9 +672,16 @@ public abstract class World implements IBlockAccess { return this.worldProvider.p()[this.getLightLevel(blockposition)]; } diff --git a/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch index 03b1d6f59..10133234a 100644 --- a/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch +++ b/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch @@ -1,4 +1,4 @@ -From f1803422eba940c40a526653484f681e7f380846 Mon Sep 17 00:00:00 2001 +From f73f0d7454e1a19c501a2cca873fbc490afad9ef 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/0055-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch index 75f072ddd..eb2ad7910 100644 --- a/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From 1fed60fae44318412d1b5b37820c7b6a38814d10 Mon Sep 17 00:00:00 2001 +From 9e2c25116d18e4cd360d8c7a55b9e096e8648d39 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 diff --git a/CraftBukkit-Patches/0056-BungeeCord-Support.patch b/CraftBukkit-Patches/0056-BungeeCord-Support.patch index d2546b4f2..a70b7b639 100644 --- a/CraftBukkit-Patches/0056-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0056-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From be18153c2049202699a2659ed4891f40ede9f117 Mon Sep 17 00:00:00 2001 +From 78615740f588e09cc50cccc8d735de09200091fb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -132,7 +132,7 @@ index fe4121f..1d3d00f 100644 if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0741d7b..69fa301 100644 +index 537932a..dbb3324 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -559,7 +559,13 @@ public final class CraftServer implements Server { @@ -151,7 +151,7 @@ index 0741d7b..69fa301 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 494c0bc..37b8287 100644 +index 26e77d2..edac4c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1316,6 +1316,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch index 885503f95..a414fa3db 100644 --- a/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From 2745cb1ef3ac96e96fc5147043cd587c5143aac3 Mon Sep 17 00:00:00 2001 +From 7a2d55f11e40d55120d908d5eab00ce4a7768b42 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 diff --git a/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch index d7087fd03..b92b90da5 100644 --- a/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From 6ba534764c69a6f193cb1fce8af5d6e13a0f6b1e Mon Sep 17 00:00:00 2001 +From 4e12fdec7d72b72b4ccdedef8613c25abac165c6 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 65c3a66..79f0fdb 100644 +index adbd92e..cdef354 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -61,7 +61,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch index f8f67a03c..2f36da23d 100644 --- a/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From acccbf3a5331907ed855cafc8fba8b6ce8e995e7 Mon Sep 17 00:00:00 2001 +From b00026fd4d2ee0827c2b68775bb4588aba80b93e 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/0060-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch index 3a00b95de..933a7ceaa 100644 --- a/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,14 +1,14 @@ -From cfaf51175deab8cb8606e574dbd5515b28dc55c8 Mon Sep 17 00:00:00 2001 +From c502d8318bc17af0363db62a52b546c7d451cc16 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 79f0fdb..0d2682d 100644 +index cdef354..6ff5211 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -518,6 +518,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -520,6 +520,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs } } catch (Throwable throwable) { MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable); diff --git a/CraftBukkit-Patches/0061-Particle-API.patch b/CraftBukkit-Patches/0061-Particle-API.patch index 4703a6cd8..d166ee58f 100644 --- a/CraftBukkit-Patches/0061-Particle-API.patch +++ b/CraftBukkit-Patches/0061-Particle-API.patch @@ -1,19 +1,20 @@ -From 2ab992704cc79f958e0f794be42191c004ecbed9 Mon Sep 17 00:00:00 2001 +From cad4a665ef46edecb4d0f6769c06e8317fb683de Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java -index 7de0de5..7eca388 100644 +index 7de0de5..13f9e9d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java -@@ -55,6 +55,8 @@ public class CraftEffect { +@@ -55,6 +55,9 @@ public class CraftEffect { Validate.isTrue(((Material) data).isBlock(), "Material is not a block!"); datavalue = ((Material) data).getId(); break; + case ITEM_BREAK: + datavalue = ((Material) data).getId(); ++ break; default: datavalue = 0; } @@ -131,7 +132,7 @@ index 13f85d5..e395704 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 37b8287..fb1347e 100644 +index edac4c7..8cc56d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1342,6 +1342,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch index 0dc22f8e1..0f4df3042 100644 --- a/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch @@ -1,4 +1,4 @@ -From 8cd4d276b754d7b0967c9e00cb1bcb29ab60a8c0 Mon Sep 17 00:00:00 2001 +From c23721d38a84ae8cfbdae9374b4640409979aad4 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 diff --git a/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch index fe53f62ac..c90107e05 100644 --- a/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch @@ -1,14 +1,14 @@ -From 7156eb1dd517f94b6411650424fc37e4bd394d9b Mon Sep 17 00:00:00 2001 +From 8565af4935a9f8a438bacca374c5d4460a6ea368 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 045defc..a35ec3f 100644 +index d3ee73d..10f6210 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1037,33 +1037,60 @@ public abstract class World implements IBlockAccess { +@@ -1050,33 +1050,60 @@ public abstract class World implements IBlockAccess { int i1 = MathHelper.floor(axisalignedbb.c); int j1 = MathHelper.floor(axisalignedbb.f + 1.0D); diff --git a/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index 8367accba..aae853be9 100644 --- a/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From 3b6a6cd4f4eb99f3788c780cd02e47c7a4eed45c Mon Sep 17 00:00:00 2001 +From fc6a0de243baacaac6b5a234beaa9a414c24ec69 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 diff --git a/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch index 079981690..5fae591ef 100644 --- a/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From 423d560676e360967616e27a0699bb2a1ac123a6 Mon Sep 17 00:00:00 2001 +From cf8f74feef3d3fbed4cd960837d6fa3c2d2201c6 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 diff --git a/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch index f15718e2e..be8d93087 100644 --- a/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch @@ -1,11 +1,11 @@ -From b0fb0d01c45d1489f6b10fda2fe987ec822cb115 Mon Sep 17 00:00:00 2001 +From f1bdb825e52f4198145ecba2da30fb0f917a2924 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fb1347e..a00d630 100644 +index 8cc56d2..5767ab4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1239,7 +1239,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch index 148dfaea9..269018fe8 100644 --- a/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From 7a91f20d04ef923de42b623bab99e54f921820bd Mon Sep 17 00:00:00 2001 +From 352b23038a34b51f4a10872b80543e57a0a23c9a Mon Sep 17 00:00:00 2001 From: slide23 Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option diff --git a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch index 540e633a2..b87a93591 100644 --- a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From 704d165c8f08c6ab3028c3f4721a49ae652d7f24 Mon Sep 17 00:00:00 2001 +From 5fb23e4d43a4f4e324d53b49f766977aa3504d4b 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 diff --git a/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch index 26df85569..14fcd0161 100644 --- a/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch @@ -1,4 +1,4 @@ -From 59f1349abaf58fc3075438f33491036bd9f86dc8 Mon Sep 17 00:00:00 2001 +From 9af964a3381eac330301137f6d1a4561a680c49c 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 diff --git a/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch index 6361fa47b..408a24eef 100644 --- a/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,14 +1,14 @@ -From 49b0c41fc7fde1660d06dbb04f5b0278935f9b92 Mon Sep 17 00:00:00 2001 +From ff274b6f8e30286775d5c6b10f50490523591142 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0d2682d..e82c297 100644 +index 6ff5211..85c3e3f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -717,7 +717,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -719,7 +719,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs worldserver.doTick(); worldserver.timings.doTick.stopTiming(); // Spigot } catch (Throwable throwable1) { @@ -22,7 +22,7 @@ index 0d2682d..e82c297 100644 worldserver.a(crashreport); throw new ReportedException(crashreport); } -@@ -727,7 +733,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -729,7 +735,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs worldserver.tickEntities(); worldserver.timings.tickEntities.stopTiming(); // Spigot } catch (Throwable throwable2) { diff --git a/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch index 7870df37b..42d70f95f 100644 --- a/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0071-Replace-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From dd974038e5345b2a5eeea4c73328db406d16abe0 Mon Sep 17 00:00:00 2001 +From 040f87b48e7698730fff7107a8d776ed3c9cefce Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Replace AutoSave Mechanism @@ -6,10 +6,10 @@ Subject: [PATCH] Replace AutoSave Mechanism The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e82c297..83e73a4 100644 +index 85c3e3f..bf2002c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -625,7 +625,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -627,7 +627,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs SpigotTimings.worldSaveTimer.startTiming(); // Spigot this.methodProfiler.a("save"); this.v.savePlayers(); diff --git a/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch index ecb42a197..0ed670446 100644 --- a/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch +++ b/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch @@ -1,4 +1,4 @@ -From 0b32283b5dd3214150ac86dbb4e5c07e93a57c8b Mon Sep 17 00:00:00 2001 +From 07704d776ea0fce7002e03adb07994549e61358d 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 diff --git a/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch index f84ba9ed1..4fa9c7ea1 100644 --- a/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch +++ b/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch @@ -1,4 +1,4 @@ -From 11d7d1221554e9a1dc18f9ef598608fa90e972b8 Mon Sep 17 00:00:00 2001 +From fc8066aa363f20a5c37f8789294943d7f56e16a1 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 18 Jan 2014 19:32:42 +0000 Subject: [PATCH] Support non-prefixed URLs diff --git a/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index 2e81435d6..7e74237fe 100644 --- a/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,4 +1,4 @@ -From 06bbb81efa37499c608feaa4911d006a27c07eaf Mon Sep 17 00:00:00 2001 +From 376a98c626d952be1ec7c4b0243c54a4f205fb23 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. diff --git a/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index c388850a8..f328d75e2 100644 --- a/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From 511f7cb92f5fedc1e1f3b652da47e7aee95e7c7f Mon Sep 17 00:00:00 2001 +From c39b1e98057b0fa00d788e6da9c6c99e06503763 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 diff --git a/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch index de8f94cab..7b281cf57 100644 --- a/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From 3dd34878baf715348c1253f0c29229b7e6fb5cd1 Mon Sep 17 00:00:00 2001 +From af448ce7f98122ac62de59e8d27d1f80159b1449 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 83e73a4..36fdaf7 100644 +index bf2002c..fd4c26a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -118,6 +118,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -21,7 +21,7 @@ index 83e73a4..36fdaf7 100644 public MinecraftServer(OptionSet options, Proxy proxy, File file1) { this.d = proxy; -@@ -471,6 +477,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -473,6 +479,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.isRunning = false; } @@ -35,7 +35,7 @@ index 83e73a4..36fdaf7 100644 public void run() { try { if (this.init()) { -@@ -481,38 +494,34 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -483,38 +496,34 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.r.setServerInfo(new ServerPingServerData("1.8", 47)); this.a(this.r); diff --git a/CraftBukkit-Patches/0077-Add-Spigot-Links.patch b/CraftBukkit-Patches/0077-Add-Spigot-Links.patch index e29534592..a36211af7 100644 --- a/CraftBukkit-Patches/0077-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0077-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 504ed1e4c77c1c7f64e8ecaccdac7fb2233a47c4 Mon Sep 17 00:00:00 2001 +From 5bc28242a60cdc16a143b6e711e43dfff9b9b6bd 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/0078-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch index 3d82041bc..b085993a1 100644 --- a/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From d8949d3fc0f3f931dc7f9d1bd878c6207621575c Mon Sep 17 00:00:00 2001 +From 4577b3294c5d498feae4d28113347212d7a6a5d1 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 diff --git a/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch index fe34e4954..e418ec09d 100644 --- a/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 4a300e8267e9bffccbd8070e05cfeb69de810358 Mon Sep 17 00:00:00 2001 +From 8c82568bb061577addd20a69f8e3197c593e9c5e 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 diff --git a/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch index 4450e9f50..e731048f5 100644 --- a/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch @@ -1,11 +1,11 @@ -From 741a5657bb224d4284d47f2c7c57a62697746406 Mon Sep 17 00:00:00 2001 +From c3741d045436029602f6d03b24a376a9bbe92cf7 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 3bc77ae..5578300 100644 +index d8c8151..5aed971 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -220,7 +220,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch index 07d88425c..d36ac46c5 100644 --- a/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch @@ -1,11 +1,11 @@ -From 26840bbaeb380ec51927a9643f2642320d2d5c2e Mon Sep 17 00:00:00 2001 +From d78296edfd7ad332f5ee83a2cbe284e3ffaa459a 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5578300..67230f6 100644 +index 5aed971..e8dab78 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -18,7 +18,7 @@ index 5578300..67230f6 100644 public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a00d630..9d609c2 100644 +index 5767ab4..7e499cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1399,6 +1399,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch index 22208b786..985e9d541 100644 --- a/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From a0f1bc858a82f34ab796cb4302afdd4ce181e1c7 Mon Sep 17 00:00:00 2001 +From 9b567653a5ac2657bce8dbed472768f6f7bbd311 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions diff --git a/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 202c64bc3..a79746276 100644 --- a/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From 16bd2064ad68aa5561e0f6e4840af0eafb698955 Mon Sep 17 00:00:00 2001 +From 1f36a4752012204a8bffd4232cac0991ad1a4a38 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 diff --git a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch index 7d6d04e28..1fb70a8b9 100644 --- a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch @@ -1,11 +1,11 @@ -From 44c738d328190c1e42e7b1d5a701a389934704a9 Mon Sep 17 00:00:00 2001 +From 742e8a571717308cbe2687060a0216a32e1f3579 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6ffce8f..064b4c6 100644 +index 03f6b05..3cb84aa 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -918,9 +918,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch index a25985f82..a1fee7db6 100644 --- a/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 94f26cdbde92dbf7d2d0587208bcdcd85ac33e9a Mon Sep 17 00:00:00 2001 +From 5c461033875ead74b7ef1c83e6d6bc3e3938e347 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 diff --git a/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch index 41fddb723..c29af769e 100644 --- a/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch @@ -1,11 +1,11 @@ -From b4c8e78b1fc5c81957f42f22ed3622817bc6e7e4 Mon Sep 17 00:00:00 2001 +From e80a25bd2cf7de3613071bbd530df3c4f3ce6ade 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9d609c2..0836137 100644 +index 7e499cd..23c7219 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1405,6 +1405,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch index 429f36757..5e2f88f6c 100644 --- a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch @@ -1,14 +1,14 @@ -From b0afa4907c4edd212821d34e57f4165875c95532 Mon Sep 17 00:00:00 2001 +From 209729d613ba8aa1d01c0fa8b2fc95ce7893fdda 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 064b4c6..da185c1 100644 +index 3cb84aa..314c9ca 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1642,7 +1642,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1641,7 +1641,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize(); // CraftBukkit - Add invalidItems check diff --git a/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch index 2642e815d..db1b74bd4 100644 --- a/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch @@ -1,11 +1,11 @@ -From 86719075f68287a5c5ddeb0482c6bc96ed06f6c1 Mon Sep 17 00:00:00 2001 +From 99bc7c53a13e3bf05ced99383d6b88ee65050ad7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0836137..75061e6 100644 +index 23c7219..573e401 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1059,6 +1059,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index 094fd51fe..13bb3f9ea 100644 --- a/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,11 +1,11 @@ -From eaf88de580420442d6a126d77a927140b7765cca Mon Sep 17 00:00:00 2001 +From e3fe3d63d1ac971bc8db54461b67e38f0445c464 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 69fa301..5ca8cc8 100644 +index dbb3324..55658b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -315,8 +315,11 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 49f6030bc..31998b43c 100644 --- a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From ea7cdc3104db651903e099f2a012cd2005e6ec90 Mon Sep 17 00:00:00 2001 +From 193bc8c57b645373f66ab8943d889ebe2f3af87a 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. @@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index da185c1..92607c6 100644 +index 314c9ca..d7cd546 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1999,7 +1999,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1998,7 +1998,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - Add "isDisconnected" method diff --git a/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch index a97612164..a2d52c1e1 100644 --- a/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From c5c47eb99e11506b4829c1c76e132b6268d8d80a Mon Sep 17 00:00:00 2001 +From 730b85ab092a7365bede2db67e038d2c8c86f748 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API diff --git a/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch index f6bbc6b37..a9fca8336 100644 --- a/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 88d4630955659bc4cf65d8853014f7422a360b98 Mon Sep 17 00:00:00 2001 +From 0b5adb4006976878c7a02dafb0ca526d7f1345e6 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 diff --git a/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch index ed20ad58b..ec5ce267b 100644 --- a/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From ed0834d044f738e2e879bb96bd4cc9b67e7dc3c4 Mon Sep 17 00:00:00 2001 +From f8af922bed5a2a888eaa3f9277f901902095242b 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 diff --git a/CraftBukkit-Patches/0094-Guard-Entity-List.patch b/CraftBukkit-Patches/0094-Guard-Entity-List.patch index 5946ee731..71330097e 100644 --- a/CraftBukkit-Patches/0094-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0094-Guard-Entity-List.patch @@ -1,11 +1,11 @@ -From 4d78db78eea3b9c0ad686d1283f5a1c7586c972f Mon Sep 17 00:00:00 2001 +From 352f7f79e63fef67ea3a162234805ff1bb9d4b7a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 09:03:28 +1100 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 a35ec3f..703b919 100644 +index 10f6210..d2168c6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -33,7 +33,32 @@ import org.bukkit.event.weather.ThunderChangeEvent; @@ -42,7 +42,7 @@ index a35ec3f..703b919 100644 protected final List g = Lists.newArrayList(); public final List h = Lists.newArrayList(); public final List tileEntityList = Lists.newArrayList(); -@@ -88,6 +113,7 @@ public abstract class World implements IBlockAccess { +@@ -101,6 +126,7 @@ public abstract class World implements IBlockAccess { private int tickPosition; // Spigot start @@ -50,7 +50,7 @@ index a35ec3f..703b919 100644 protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList; protected float growthOdds = 100; protected float modifiedOdds = 100; -@@ -1280,6 +1306,7 @@ public abstract class World implements IBlockAccess { +@@ -1293,6 +1319,7 @@ public abstract class World implements IBlockAccess { org.spigotmc.ActivationRange.activateEntities(this); // Spigot timings.entityTick.startTiming(); // Spigot @@ -58,7 +58,7 @@ index a35ec3f..703b919 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); -@@ -1316,12 +1343,15 @@ public abstract class World implements IBlockAccess { +@@ -1329,12 +1356,15 @@ public abstract class World implements IBlockAccess { this.getChunkAt(j, k).b(entity); } diff --git a/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch index d90165534..6c9284efb 100644 --- a/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 2317d87940f106c27011d4246d99e6e074d15acd Mon Sep 17 00:00:00 2001 +From 8166c17bd5628962813018cbd3f08e0e9f00403d Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked @@ -6,10 +6,10 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 703b919..d525845 100644 +index d2168c6..f0cf82d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1031,6 +1031,7 @@ public abstract class World implements IBlockAccess { +@@ -1044,6 +1044,7 @@ public abstract class World implements IBlockAccess { this.everyoneSleeping(); } @@ -17,7 +17,7 @@ index 703b919..d525845 100644 int i = entity.ae; int j = entity.ag; -@@ -1047,6 +1048,7 @@ public abstract class World implements IBlockAccess { +@@ -1060,6 +1061,7 @@ public abstract class World implements IBlockAccess { this.entityList.remove(index); } // CraftBukkit end diff --git a/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch index 889eb130b..70022aac1 100644 --- a/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From e21ce8917903200e7db168d5169544aed2543428 Mon Sep 17 00:00:00 2001 +From 2f9302529541e21254ecb789ba18f5d8b086740a Mon Sep 17 00:00:00 2001 From: drXor Date: Tue, 25 Feb 2014 15:15:26 -0400 Subject: [PATCH] Cancellable WitherSkull potion effect diff --git a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch index b49ab2bb9..d3b77328e 100644 --- a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From a0923006217408d7fb8141f8a6c54838f2c09206 Mon Sep 17 00:00:00 2001 +From 2e797c33e227a3d16e5b0743c02181c01af8ce8f Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! @@ -27,7 +27,7 @@ index d6c8be8..b0a90d7 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 92607c6..05ca762 100644 +index d7cd546..ef9e2dd 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch index 18ec12298..6e24d134d 100644 --- a/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From a64dab11f262b2ce8ac1a0b9a954e0c3dc2be203 Mon Sep 17 00:00:00 2001 +From 058986f4916b16d6a9782c11a4e65c6fb728f38e Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index b533131ce..0b8c2228b 100644 --- a/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From c7fdf3cf5386848e7d91111a6c42ca3af8fae66d Mon Sep 17 00:00:00 2001 +From 4561e9149f95ee8c355290b081d234056b4fb982 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 36fdaf7..bbe16d8 100644 +index fd4c26a..1525704 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1041,7 +1041,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch index fb20df3ab..b9710f6a3 100644 --- a/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From 9aee92bedd7bcf8daca7311b051ac11c1bd2540e Mon Sep 17 00:00:00 2001 +From 3ef3940c97e509ea36aba015fa9ae06fb6a5816b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:23:58 +1000 Subject: [PATCH] Treat Bungee as Online Mode diff --git a/CraftBukkit-Patches/0101-Add-Conversion-Message.patch b/CraftBukkit-Patches/0101-Add-Conversion-Message.patch index bec3c8c5a..0a261302f 100644 --- a/CraftBukkit-Patches/0101-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0101-Add-Conversion-Message.patch @@ -1,4 +1,4 @@ -From e0545b7da70438cd421c20697b968c954f6992c9 Mon Sep 17 00:00:00 2001 +From 6439f109829d49df5f1333f902f106fb825da0ac Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 23:30:44 +1000 Subject: [PATCH] Add Conversion Message diff --git a/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index 77f078dd8..acaff4f6c 100644 --- a/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From 66804a6e49e24829b418c31d6c30b73cd8e9387d Mon Sep 17 00:00:00 2001 +From dd287f8fcf8890ca9fcb4d6f63910f6796598a55 Mon Sep 17 00:00:00 2001 From: "gjmcferrin@gmail.com" Date: Mon, 10 Feb 2014 10:05:11 -0500 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396 diff --git a/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch index 49fdae298..73f619c6f 100644 --- a/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From d4cd4cb74299d5e40c0d640211c7438ff86f4dc6 Mon Sep 17 00:00:00 2001 +From 194512f5111d68e86abf4576085ef117b21a60e1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 09:00:59 +1000 Subject: [PATCH] Print Stack on InternalException diff --git a/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch index f79b89711..1383dcdf5 100644 --- a/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From e98d6b717bef858004359c11e2229d0566989723 Mon Sep 17 00:00:00 2001 +From 7ec105c3413b800da05393ab7a8cbdd3371f23e7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 14:41:23 +1000 Subject: [PATCH] Use Offline Player Data Once if Required. diff --git a/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index ca86e0caf..bfca50b73 100644 --- a/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,4 +1,4 @@ -From d6dee24611d41dbcc93c2a673f90c981801eccdf Mon Sep 17 00:00:00 2001 +From b45417ba03a2fcdcb4715c1d1621b33c97755f3a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 09:46:20 +1000 Subject: [PATCH] Use Provided Case for Non Existent Offline Players diff --git a/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch index 0f0bdb3aa..90a482677 100644 --- a/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch @@ -1,14 +1,14 @@ -From 732a1afd9cf2c7b64d21ac6e8cf35df904514406 Mon Sep 17 00:00:00 2001 +From 1504ad83eab2228b25ac55319678fac7f3984354 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 17:21:24 +1000 Subject: [PATCH] Check for blank OfflinePlayer Names diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5ca8cc8..ebe7abc 100644 +index 55658b6..19b0c4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1269,6 +1269,7 @@ public final class CraftServer implements Server { +@@ -1274,6 +1274,7 @@ public final class CraftServer implements Server { @Deprecated public OfflinePlayer getOfflinePlayer(String name) { Validate.notNull(name, "Name cannot be null"); diff --git a/CraftBukkit-Patches/0107-Fix-Player-Banning.patch b/CraftBukkit-Patches/0107-Fix-Player-Banning.patch index 9a78fb7ce..a2e9bd54c 100644 --- a/CraftBukkit-Patches/0107-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0107-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 9a200c666d5d193362482ad0714a8645bacb009b Mon Sep 17 00:00:00 2001 +From cebe57f8332d43c0da78e8dd987818932315232d Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:32:48 +1000 Subject: [PATCH] Fix Player Banning diff --git a/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch index fe0ade964..97064ee84 100644 --- a/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From ff439435253866b248e5d70d85e8a884bb13a729 Mon Sep 17 00:00:00 2001 +From 7e0e2dfd75e5e36659d206ad7bf898d903c567af Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 10:09:56 +1000 Subject: [PATCH] Fix ban expire dates. diff --git a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch index eafe19168..ffe00ab6d 100644 --- a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch @@ -1,4 +1,4 @@ -From d4bab1cf318029a9209c3a1df183376041355eae Mon Sep 17 00:00:00 2001 +From 3118ca054fa2eaabfb66662704bc60f62950efc7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 11:14:38 +1000 Subject: [PATCH] Correct Ban Expiration diff --git a/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch index 7494450f2..961f06055 100644 --- a/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch @@ -1,14 +1,14 @@ -From dbaaa91dec68aed24f7c5e7e4fd1b287c835e338 Mon Sep 17 00:00:00 2001 +From ef2f6fc7c62a328bd003a96fb695173fd970be61 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 Apr 2014 01:40:30 -0400 Subject: [PATCH] Convert Horses owner to UUID diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index b3ad7e7..50e9292 100644 +index db86610..ac37892 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java -@@ -1010,6 +1010,17 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener { +@@ -1018,6 +1018,17 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener { s = nbttagcompound.getString("OwnerUUID"); } else { String s1 = nbttagcompound.getString("Owner"); diff --git a/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch index 3ea5c39cc..adc280a28 100644 --- a/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From 2242016186aa31ccb94795774da6c3b5e69ff05d Mon Sep 17 00:00:00 2001 +From af4cca3fdb0ff0af9e22638500b9cf24f39d6f9c Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:22:22 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch index 8cda0f8a7..3cb085d0d 100644 --- a/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From f169f48d58863f32f7e4236646171e26cec4eec3 Mon Sep 17 00:00:00 2001 +From 127d0ce6119ec93e148c623942ce97fb3bafa33e Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:53 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch index 784eab2d4..de9d6628d 100644 --- a/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From dae8da7506be2433d14e08eaa23eeae9e8d10183 Mon Sep 17 00:00:00 2001 +From 53fd961aebd1c269c92d4617c3ec81825e26f3cf Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 11:16:54 +1000 Subject: [PATCH] Log null TileEntity Owner diff --git a/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch index 2406bc776..da03bf835 100644 --- a/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,14 +1,14 @@ -From 0cb0d751070a587847560335508c8c0275d5e823 Mon Sep 17 00:00:00 2001 +From b74d329decdd9399ada0706ea1dc572aaaf86c8a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 18:58:00 +1000 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ebe7abc..3332792 100644 +index 19b0c4d..d82ac04 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1271,11 +1271,6 @@ public final class CraftServer implements Server { +@@ -1276,11 +1276,6 @@ public final class CraftServer implements Server { Validate.notNull(name, "Name cannot be null"); com.google.common.base.Preconditions.checkArgument( !org.apache.commons.lang.StringUtils.isBlank( name ), "Name cannot be blank" ); // Spigot diff --git a/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch index 4ad7af2a6..376477c3e 100644 --- a/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From eb16ed4408643a996d1f6915b4a29dd78da6f35e Mon Sep 17 00:00:00 2001 +From a2bf85035fac8dc52b525d34579a57704bd9fa09 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 20 Apr 2014 13:18:55 +0100 Subject: [PATCH] Convert player skulls async diff --git a/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 5a7d1d222..92358e8d4 100644 --- a/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,14 +1,14 @@ -From 440adcc546b800e60752817752901c510b81ff1b Mon Sep 17 00:00:00 2001 +From fb0f1a4889a2c32c2f1bd436ce192c68fcb58776 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d525845..ffcef45 100644 +index f0cf82d..3d45061 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -118,6 +118,8 @@ public abstract class World implements IBlockAccess { +@@ -131,6 +131,8 @@ public abstract class World implements IBlockAccess { protected float growthOdds = 100; protected float modifiedOdds = 100; private final byte chunkTickRadius; @@ -17,7 +17,7 @@ index d525845..ffcef45 100644 public static long chunkToKey(int x, int z) { -@@ -518,6 +520,9 @@ public abstract class World implements IBlockAccess { +@@ -531,6 +533,9 @@ public abstract class World implements IBlockAccess { } // CraftBukkit end iblockdata.getBlock().doPhysics(this, blockposition, iblockdata, block); diff --git a/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch index 82af1ecda..48911020d 100644 --- a/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From ad60e0a03eed48a34949230c3338e09129786003 Mon Sep 17 00:00:00 2001 +From 56989d31da36775b31523b8aeaf811262bcef094 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:48:35 +1000 Subject: [PATCH] Check Skull canPlace diff --git a/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch b/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch index 14940c109..c0713f097 100644 --- a/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch +++ b/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch @@ -1,4 +1,4 @@ -From b2b3c0115c12da106161b8f7c143bc77c2388430 Mon Sep 17 00:00:00 2001 +From 614ea6fac94e4fa3d2e901bbf41c81907347fe47 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. diff --git a/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch index 537874d4c..90b56af2f 100644 --- a/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From 539a8728f06d465151bf0bdf833c6d3d8e3839aa Mon Sep 17 00:00:00 2001 +From 3b15cce121285a0a63220940aa09ba145ba79504 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 25 Apr 2014 23:46:46 +0200 Subject: [PATCH] Fix race condition that could kill connections before they diff --git a/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch index b6861eac3..eb25758f8 100644 --- a/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From 3aa41a8b9df8054e481316c0e17e51f19a2c983c Mon Sep 17 00:00:00 2001 +From 7ca132b491e99801dd2338c9879afdae06b3af3f Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 25 Apr 2014 18:17:30 -0400 Subject: [PATCH] Configurable UserCache cap diff --git a/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch index ff1931f5d..9a232dcef 100644 --- a/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From 57153fb375acd95b5a4ef6c5c88c12dffa783b26 Mon Sep 17 00:00:00 2001 +From 02509dc7476f72618938ce44287e2dbeec7a17e3 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:05:19 +0200 Subject: [PATCH] Implement PlayerSpawnLocationEvent. diff --git a/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch index 15ae10a6c..f70f836a4 100644 --- a/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From 4fee8bb37ebd62f42653a776f40a471733f70441 Mon Sep 17 00:00:00 2001 +From 56ed76c2889bd362dca4fbb2fa777b9c2cb1833a Mon Sep 17 00:00:00 2001 From: hauno Date: Tue, 6 May 2014 18:01:37 -0700 Subject: [PATCH] Cap Objective Score Length diff --git a/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch index 660f9d311..72d165605 100644 --- a/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From e84429abbde66bfd8e9c05963d399d3d324f374e Mon Sep 17 00:00:00 2001 +From 1e5e5842a6931bb5e35c926906900edd0fc19e91 Mon Sep 17 00:00:00 2001 From: riking Date: Wed, 14 May 2014 13:46:48 -0700 Subject: [PATCH] Process conversation input on the main thread. Fixes @@ -6,7 +6,7 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 05ca762..8c688ab 100644 +index ef9e2dd..ea9cdcc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -903,7 +903,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch index 9e938dc8f..302089127 100644 --- a/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,14 +1,14 @@ -From 34be0c8f0d948a3f13ee36ce5fc6eb0cfd2478ba Mon Sep 17 00:00:00 2001 +From b51a0a33ce75b69848531c0a50332d0c0aeec4ab Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 23 May 2014 18:05:10 -0400 Subject: [PATCH] Configurable save-on-stop-only for UserCache diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bbe16d8..9080d46 100644 +index 1525704..28c91cd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -457,7 +457,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -459,7 +459,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs if (this.m.d()) { this.m.e(); } diff --git a/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch index 2346ec8cf..7b4107704 100644 --- a/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From 7f584e654ad7782fdf6d8030337fb49da685f155 Mon Sep 17 00:00:00 2001 +From c73ddaa7d7bcd47fa46a513343b34e2d624d4c06 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Jun 2014 19:40:00 +1000 Subject: [PATCH] Prevent Unbounded IntCache Growth diff --git a/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch index cd1c6a53e..fd2e713b2 100644 --- a/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch @@ -1,4 +1,4 @@ -From d685c04fccc5fe9ca2cc5f305d4ac6be1d0cc9ff Mon Sep 17 00:00:00 2001 +From f436dce04a87722898533c5fe78cefcd00e3bad4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Jun 2014 23:42:52 +0100 Subject: [PATCH] Add damager to the unhandled error diff --git a/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch index 2025f7fdc..6e7dd6a61 100644 --- a/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From 7556d8e24e4855b01682d52b35d9870be72fbe81 Mon Sep 17 00:00:00 2001 +From acb38c2604b45df232ba1a71db38acb806268ee7 Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Tue, 24 Dec 2013 07:55:23 -0800 Subject: [PATCH] Cross World Entity Teleportation diff --git a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch index 190b4fb3f..bcd086586 100644 --- a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch @@ -1,11 +1,11 @@ -From 40146e37ae633b5a6fadd738428bb3690c595597 Mon Sep 17 00:00:00 2001 +From 58c92688a9ff784173fd881118035ec2d2ba3398 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 29 Jun 2014 21:10:34 +0100 Subject: [PATCH] Limit block placement/interaction packets diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8c688ab..a42c293 100644 +index ea9cdcc..a3e4438 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -615,9 +615,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0129-Better-item-validation.patch b/CraftBukkit-Patches/0129-Better-item-validation.patch index a90a57f01..61e37b54a 100644 --- a/CraftBukkit-Patches/0129-Better-item-validation.patch +++ b/CraftBukkit-Patches/0129-Better-item-validation.patch @@ -1,4 +1,4 @@ -From c7dd65e14069ae6f27bafad69f405a36f2884ae1 Mon Sep 17 00:00:00 2001 +From 002ce45a97550324fa70f68268fa70fdfe98fc7c Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 2 Jul 2014 23:35:51 +0100 Subject: [PATCH] Better item validation diff --git a/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch index 84a98bb42..e04632a9c 100644 --- a/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From 47869e25635908f6004c17c68537e0eb0e6e1647 Mon Sep 17 00:00:00 2001 +From e58fbbf29dd242c7977aa6ea455adf7371bbba29 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation diff --git a/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch index 2e4da4580..6bfd54d34 100644 --- a/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From 30f32bbcead087106aabc4058ff2cbf1b8f42198 Mon Sep 17 00:00:00 2001 +From e2d5da82f26b1bcb5f8ebf9a977f52c7da4ef2ff Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 09:01:50 +1000 Subject: [PATCH] Disable ResourceLeakDetector @@ -6,7 +6,7 @@ Subject: [PATCH] Disable ResourceLeakDetector Hopefully no plugins are somehow leaking buffers, but disabling the ResourceLeakDetector is a good thing for performance of the Netty IO subsytem (it's been disabled in BungeeCord for a while now). diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9080d46..7bfd6f5 100644 +index 28c91cd..0c02747 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -126,6 +126,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs diff --git a/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch index 487b666cb..ea411f59c 100644 --- a/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From ec634c18d2d410e766b9390aada8c9833287bea7 Mon Sep 17 00:00:00 2001 +From 0c830ff1ed96046b3eeb471c8bc499dcd9be0e1b Mon Sep 17 00:00:00 2001 From: Suddenly Date: Sat, 5 Jul 2014 16:56:44 +0100 Subject: [PATCH] Add More Information to session.lock Errors diff --git a/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch index 253c8745a..99bcc9b9f 100644 --- a/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From c568c3fd814c8e3d9d6474e8b8078815061163df Mon Sep 17 00:00:00 2001 +From f3edd8e4f0b1fb7cec4651daf41dd10e47822208 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading diff --git a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch index d728fd87e..1c24a2816 100644 --- a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From 968e4acf5e3659602178d7db38b5bd350624bb87 Mon Sep 17 00:00:00 2001 +From 703eab9bb4d6cba05271d68b97a3d8ce50205ead Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 20:27:52 +1000 Subject: [PATCH] Fix Slow "Loading Libraries" diff --git a/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch index 5a8b226f4..f601444d6 100644 --- a/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From 249022760700b094d2115bcd87d1c324c5d01087 Mon Sep 17 00:00:00 2001 +From 79775244d438c9a01ec9fb4ba2e66a8e65c9de27 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 9 Jul 2014 10:35:44 +1000 Subject: [PATCH] Add CommandLine EULA Flag diff --git a/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index 16d15cc5b..a98d0c4ee 100644 --- a/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From f3af473302872e73efb30b5803d17c20467a2105 Mon Sep 17 00:00:00 2001 +From 0c25a0a897497ccfd8379facda3ef6ca1a3d30ac Mon Sep 17 00:00:00 2001 From: drXor Date: Thu, 17 Jul 2014 21:13:15 -0400 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked diff --git a/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 0f43b669d..77a94c36b 100644 --- a/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From 39d3162e43feed7bc3f9de13c2578d1b6f4748a2 Mon Sep 17 00:00:00 2001 +From 383992b4386c2ade3121e49027abe147bae13914 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots diff --git a/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch index d1d80ee08..903d93e88 100644 --- a/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch @@ -1,11 +1,11 @@ -From e71e8c43c18abafed4cc6b2d436f6ca31837335b Mon Sep 17 00:00:00 2001 +From 9be921dd637edaadca7d6cc409999a087a3cdf7a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 19:54:41 +0100 Subject: [PATCH] Prevent a crash involving attributes diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 75061e6..5864a51 100644 +index 573e401..ae59896 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1309,7 +1309,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch index c8199d99e..8705e6abd 100644 --- a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch @@ -1,11 +1,11 @@ -From eb56d9b59833f21b4446ee2c4b4052d639e79871 Mon Sep 17 00:00:00 2001 +From 404e7af8294bcfa7a3267133c0c0e9708713f63e Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 4 Jul 2014 23:03:13 +0200 Subject: [PATCH] Make "moved wrongly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a42c293..6697282 100644 +index a3e4438..3246c0f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -405,7 +405,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch index 646c768cd..64338b90d 100644 --- a/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch @@ -1,14 +1,14 @@ -From 7e342d18c29d913aab4965fddb7ad0a556b65e56 Mon Sep 17 00:00:00 2001 +From 17b049ba64de3c6f72ba6c082ff59ab60e75c577 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ffcef45..2f79c83 100644 +index 3d45061..f441c84 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1859,6 +1859,7 @@ public abstract class World implements IBlockAccess { +@@ -1872,6 +1872,7 @@ public abstract class World implements IBlockAccess { } } diff --git a/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch index a8519ec8f..bdfd69864 100644 --- a/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch @@ -1,11 +1,11 @@ -From 4c9a281b6ca396b32d40f35ba1d6c765bc584496 Mon Sep 17 00:00:00 2001 +From 128a4b57c967c09c499e381fbbe9578cd782ccaf Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 22 Jul 2014 15:59:01 +0200 Subject: [PATCH] Make "moved too quickly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6697282..a8dae62 100644 +index 3246c0f..9240aab 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -378,7 +378,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch index 070f87de0..57df95e5e 100644 --- a/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch +++ b/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch @@ -1,4 +1,4 @@ -From b4c70c83ead24b304d8894ae495a287c0c155411 Mon Sep 17 00:00:00 2001 +From 2961d7b5e91f52bd3e24ecf1125e90d9155b68f3 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Sat, 19 Apr 2014 16:58:26 -0400 Subject: [PATCH] Alternative Hopper Ticking @@ -370,10 +370,10 @@ index 280d64f..5355532 100644 public boolean o() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2f79c83..296206f 100644 +index f441c84..eb5b1db 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -120,6 +120,7 @@ public abstract class World implements IBlockAccess { +@@ -133,6 +133,7 @@ public abstract class World implements IBlockAccess { private final byte chunkTickRadius; public static boolean haveWeSilencedAPhysicsCrash; public static String blockLocation; @@ -381,7 +381,7 @@ index 2f79c83..296206f 100644 public static long chunkToKey(int x, int z) { -@@ -137,6 +138,43 @@ public abstract class World implements IBlockAccess { +@@ -150,6 +151,43 @@ public abstract class World implements IBlockAccess { { return (int) ( ( ( k >> 32 ) & 0xFFFF0000L ) | ( ( k >> 16 ) & 0x0000FFFF ) ); } @@ -425,7 +425,7 @@ index 2f79c83..296206f 100644 // Spigot end public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot -@@ -372,6 +410,14 @@ public abstract class World implements IBlockAccess { +@@ -385,6 +423,14 @@ public abstract class World implements IBlockAccess { // Modularize client and physic updates notifyAndUpdatePhysics(blockposition, chunk, block1, block, i); } @@ -440,7 +440,7 @@ index 2f79c83..296206f 100644 // CraftBukkit end return true; -@@ -1372,6 +1418,7 @@ public abstract class World implements IBlockAccess { +@@ -1385,6 +1431,7 @@ public abstract class World implements IBlockAccess { } // CraftBukkit end diff --git a/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch index 98a4abc4f..82d5ce235 100644 --- a/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From a93fc618f95f538d1d45bff747f95430afca3e64 Mon Sep 17 00:00:00 2001 +From 1ae1dcab1312a51a4975680980d63f3f9f2d9026 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Jul 2014 20:46:04 +1000 Subject: [PATCH] Apply NBTReadLimiter to more things. diff --git a/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch index 37d509d5c..16982988f 100644 --- a/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From b41de7a21ea34e6070b87428879a0352ceb7fa7c Mon Sep 17 00:00:00 2001 +From ecf4815c1b72c3c3821e0512fe2aadffb68f9c3a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. diff --git a/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch b/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch index 2b948d757..85e1768ea 100644 --- a/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch +++ b/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch @@ -1,4 +1,4 @@ -From 092bf9fb992a2fbba6a139a69341d5a2bab6280d Mon Sep 17 00:00:00 2001 +From 94299797492bfd4863ea90793fd5e1deb0576323 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 28 Jul 2014 11:42:11 +0100 Subject: [PATCH] Add an option for a global cache for any request on Mojang's diff --git a/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch index 1c1507d7a..f6f1796e0 100644 --- a/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 0a24088a6bdd4efb63c8ea55646bbc34d6b2a8f2 Mon Sep 17 00:00:00 2001 +From a29eab8d83e2efd67e42a08569066cc118f654f1 Mon Sep 17 00:00:00 2001 From: Maxim Van de Wynckel Date: Wed, 30 Jul 2014 01:19:51 +0200 Subject: [PATCH] Only fetch an online UUID in online mode @@ -12,10 +12,10 @@ You want to store data for player "Test" who never joined. An online UUID is cr The player Test joins with an offline UUID but that will not match the online UUID of the saved data. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3332792..fcb22d9 100644 +index d82ac04..8117acd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1273,8 +1273,14 @@ public final class CraftServer implements Server { +@@ -1278,8 +1278,14 @@ public final class CraftServer implements Server { OfflinePlayer result = getPlayerExact(name); if (result == null) { diff --git a/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch index 1c9478e06..f6d7bdd7e 100644 --- a/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 9ea8f5bcd53963fb38bf3c1cf30a713290cee4c0 Mon Sep 17 00:00:00 2001 +From aef567662449181c785c7e44e7c5f616d9c4037c Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 31 Jul 2014 17:48:20 +0100 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go diff --git a/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch b/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch index e4fdd8fdc..0af256462 100644 --- a/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch +++ b/CraftBukkit-Patches/0148-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch @@ -1,14 +1,14 @@ -From ef3e7100e4a816f0e79814abf732468d6cf4a843 Mon Sep 17 00:00:00 2001 +From f2d2e7209a344324646541fd5fa8c3cee7c02295 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 7 Aug 2014 15:48:33 +0100 Subject: [PATCH] Fix LEFT_CLICK_AIR detection when not in creative diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a8dae62..18b9e9b 100644 +index 9240aab..b7bb153 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1114,7 +1114,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1113,7 +1113,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList float f6 = MathHelper.sin(-f1 * 0.017453292F); float f7 = f4 * f5; float f8 = f3 * f5; diff --git a/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch index ea8be28c6..c4e7ff912 100644 --- a/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0149-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 977a44a9aa4f3a3a4ad6515956396313030432a4 Mon Sep 17 00:00:00 2001 +From 1523633c4c42ce05c340947348f123726ad5dac7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak @@ -25,10 +25,10 @@ index 6bae818..a4e5294 100644 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 296206f..e6250e1 100644 +index eb5b1db..762e469 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1068,6 +1068,23 @@ public abstract class World implements IBlockAccess { +@@ -1081,6 +1081,23 @@ public abstract class World implements IBlockAccess { entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); diff --git a/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch index 4528004d4..85fc39094 100644 --- a/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0150-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From 2485a965b0b0b74235684c13ab37f88a2434ce5a Mon Sep 17 00:00:00 2001 +From faf1fecf4579035703abc6b0b7f29c6e0ea013e8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest diff --git a/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch index 69403151b..fc4c9e56b 100644 --- a/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0151-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From 3bc8ab9a6d7f6039bc8d0286f26173db8ac61e37 Mon Sep 17 00:00:00 2001 +From 81305ee404567adea739ffbd08b1e2f585284501 Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 15 Aug 2014 18:11:09 -0400 Subject: [PATCH] Remove uneeded validation diff --git a/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch index 67dac8c76..959195886 100644 --- a/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0152-Add-Hunger-Config-Values.patch @@ -1,11 +1,11 @@ -From 6edefc6bb043ba50b10b472bdceebb8a22bb51eb Mon Sep 17 00:00:00 2001 +From 743077c7a5cd59c8091cc51947722f3ec1b15881 Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0844b60..4ef5e01 100644 +index d8adce0..d96bf18 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1066,7 +1066,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -17,7 +17,7 @@ index 0844b60..4ef5e01 100644 } else if (flag1) { entity.extinguish(); } -@@ -1312,9 +1312,9 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1313,9 +1313,9 @@ public abstract class EntityHuman extends EntityLiving { super.bE(); this.b(StatisticList.u); if (this.isSprinting()) { diff --git a/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch index 5c0a7a44c..2ad88b177 100644 --- a/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0153-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From b8c9fc054e16dabf159291ac77d25bdbe1fb31fb Mon Sep 17 00:00:00 2001 +From 6a6951118b665867bf2f7328137c22199e5ef7be Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 17 Aug 2014 12:42:53 +0200 Subject: [PATCH] Make debug logging togglable. diff --git a/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch index 97df02fa9..11b432308 100644 --- a/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0154-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From 99213dbb8e21c6bec4f96b7989baf07ca83d792e Mon Sep 17 00:00:00 2001 +From 682010b58ea10a2eba83b13250f030a3658ea702 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 19 Aug 2014 11:04:21 +0100 Subject: [PATCH] Skip invalid enchants in CraftMetaItem diff --git a/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch index 51c73fcb9..565bdc9e8 100644 --- a/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0155-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From 4c30e618eeaaca1ef05bca3071e7504dc1377717 Mon Sep 17 00:00:00 2001 +From 39f6dc45ba2b718f82c064cf4dd344c0e7155cfa Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Aug 2014 18:12:32 -0400 Subject: [PATCH] Limit TNT Detonations per tick diff --git a/CraftBukkit-Patches/0156-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0156-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 2eee39fef..e45bdf622 100644 --- a/CraftBukkit-Patches/0156-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0156-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From a4d1898ef818a8c6d1b8acc134e91b5a4d434733 Mon Sep 17 00:00:00 2001 +From fca20c52e41ace119b95af8c948023b4e52bd9e0 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:35:16 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/CraftBukkit-Patches/0157-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0157-Configurable-Hanging-Tick.patch index cedbce4d6..206867030 100644 --- a/CraftBukkit-Patches/0157-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0157-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From 9fe3161a179aaa74e24f062dec45d755d14efa0e Mon Sep 17 00:00:00 2001 +From 4d6ea8da056e4930014d6e1b911c7d95c46df555 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 9 Aug 2014 13:56:51 -0400 Subject: [PATCH] Configurable Hanging Tick diff --git a/CraftBukkit-Patches/0158-Fix-Some-Memory-Leaks.patch b/CraftBukkit-Patches/0158-Fix-Some-Memory-Leaks.patch index 1642095b2..878765b9b 100644 --- a/CraftBukkit-Patches/0158-Fix-Some-Memory-Leaks.patch +++ b/CraftBukkit-Patches/0158-Fix-Some-Memory-Leaks.patch @@ -1,4 +1,4 @@ -From 6fd03495f3b5797a699b06523e7ef360c1d58b89 Mon Sep 17 00:00:00 2001 +From 2db6b2e406a40c42ffb7b2576f4bd8a5ba657123 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 21 Sep 2014 10:06:01 +1000 Subject: [PATCH] Fix Some Memory Leaks diff --git a/CraftBukkit-Patches/0159-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0159-Refactor-ItemDoor-Place.patch index d7a48184b..c158fff8a 100644 --- a/CraftBukkit-Patches/0159-Refactor-ItemDoor-Place.patch +++ b/CraftBukkit-Patches/0159-Refactor-ItemDoor-Place.patch @@ -1,4 +1,4 @@ -From 5daf123960e571270e71994bb628a3e1ded65fe3 Mon Sep 17 00:00:00 2001 +From bf8115d31c7481e0fb165da6bfdbe505a4b5649e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 30 Sep 2014 21:43:15 +1000 Subject: [PATCH] Refactor ItemDoor Place diff --git a/CraftBukkit-Patches/0160-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch b/CraftBukkit-Patches/0160-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch index e5ba320ed..8ff61f56c 100644 --- a/CraftBukkit-Patches/0160-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch +++ b/CraftBukkit-Patches/0160-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch @@ -1,4 +1,4 @@ -From efa2b170f2ca3ca35c18bcbc906c68696aa6b3c1 Mon Sep 17 00:00:00 2001 +From 5d60ed66bf42fc6932aaba1812a3f43242a886b4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 30 Sep 2014 21:49:10 +1000 Subject: [PATCH] Don't Fire InventoryCloseEvent Unless Required