Commit Graph
100 Commits
Author SHA1 Message Date
Spigot 7efd601fd6 Automatically update upstream versions. Bukkit-1.4.7-R1.0-44-g10c1edc, CraftBukkit-1.4.7-R1.0-90-geb2d96b
By: EcoCityCraft <admin@ecocitycraft.com>
2013-04-01 16:06:30 -05:00
Spigot 640ec8764c Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-90-geb2d96b
By: EcoCityCraft <admin@ecocitycraft.com>
2013-04-01 00:11:21 -05:00
Spigot 3cb7cb6c8f Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-89-g259b840
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-31 19:51:16 -05:00
Spigot 9d1aea2057 Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-88-gb39ef5e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-31 19:36:16 -05:00
Spigot 5831d58b6e Automatically update upstream versions. Bukkit-1.4.7-R1.0-42-g7c8d3d4, CraftBukkit-1.4.7-R1.0-88-gb39ef5e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-31 19:26:20 -05:00
Spigot 5cb6e6ed09 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-86-g052e955
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-31 15:41:19 -05:00
Spigot b4781e76d3 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-85-g317e6b6
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-31 13:31:21 -05:00
Spigot 6ef4fe66f2 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-83-gb08af02
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-30 02:56:19 -05:00
Spigot e054e75379 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-82-g600f688
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-29 22:51:17 -05:00
Spigot 42506dace8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-81-g7710efc
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-29 22:31:23 -05:00
Spigot 8a5e0d161a Revert commit 61b50f8d7d. Needs more testing.
By: Ammar Askar <ammar@ammaraskar.com>
2013-03-29 14:07:46 +05:00
Spigot 2af9fed17b Merge pull request #27 from agaricusb/fix-nibblearray4096
Fix lightened nibble array getChunkSnapshot on extended block IDs
By: md-5 <md_5@live.com.au>
2013-03-28 23:10:04 -07:00
Spigot 0f482a64ab Fix lightened nibble array getChunkSnapshot on extended block IDs
Fix out-of-bounds error in chunks with extended (4096) block IDs:

13:34:12 [SEVERE] [dynmap] Exception while fetching chunks:
java.lang.ArrayIndexOutOfBoundsException: 4096
    at org.bukkit.craftbukkit.v1_4_R1.CraftChunk.getChunkSnapshot(CraftChunk.java:1

http://pastie.org/6368930

Thanks to mikeprimm for this fix.

Original MCPC+ commit:
MinecraftPortCentral/MCPC-Plus@7902767397

By: Agaricus <agaricusb@yahoo.com>
2013-03-28 22:15:38 -07:00
Spigot 7ec36bb0a8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-79-gb8f8ec0
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-28 21:21:13 -05:00
Spigot c1cc87f84f Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-77-gaaaac47
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-28 20:16:09 -05:00
Spigot 9a0e180ae3 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-76-g0802c7e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-28 19:46:13 -05:00
Spigot ca055f3ef9 Just send kick packet + dc players on restart. Don't actually kick them
By: md_5 <md_5@live.com.au>
2013-03-28 18:38:42 +11:00
Spigot 84aae259d2 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-75-g7f25632
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-27 20:32:06 -05:00
Spigot 9dcbec3ee6 Merge pull request #26 from TehRainbowGuy/dos
Implement connection throttling in netty.
By: md-5 <md_5@live.com.au>
2013-03-26 23:38:33 -07:00
Spigot 6ea08ae612 Automatically update upstream versions. Bukkit-1.4.7-R1.0-39-gc84d619, CraftBukkit-1.4.7-R1.0-75-g7f25632
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-26 15:35:14 -05:00
Spigot 61b50f8d7d Implement connection throttling in netty.
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-03-26 17:46:15 +00:00
Spigot e7d7833da4 Check connected state before handling packets.
By: md_5 <md_5@live.com.au>
2013-03-26 12:09:44 +11:00
Spigot 4f5c561c9b Update to latest CB upstream.
By: md_5 <md_5@live.com.au>
2013-03-25 18:57:00 +11:00
Spigot 6de9424258 Automatically update upstream versions. Bukkit-1.4.7-R1.0-37-g9a0cafe, CraftBukkit-1.4.7-R1.0-69-gd9f4d57
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-25 01:57:57 -05:00
Spigot 86ed9076ee Close Minecart containers on Entity portal.
By: md_5 <md_5@live.com.au>
2013-03-24 18:53:01 +11:00
Spigot 4637794c28 Remove upstream pulled patch.
By: md_5 <md_5@live.com.au>
2013-03-24 10:59:27 +11:00
Spigot a28c2225c5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-35-g34239ae, CraftBukkit-1.4.7-R1.0-63-gace8206
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-23 17:32:25 -05:00
Spigot 54f7e08c6e Revert second addition to boat sending patch.
By: md_5 <md_5@live.com.au>
2013-03-24 08:20:01 +11:00
Spigot 27dc70eba4 Remove patch for upstream merge
By: Ammar Askar <ammar@ammaraskar.com>
2013-03-23 23:37:23 +05:00
Spigot 36d6fb887f Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-62-g40cbc3d
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-23 12:06:45 -05:00
Spigot 3eb3f9463d Made the world info possible to turn off.
By: totokaka <ttotokaka@gmail.com>
2013-03-23 20:15:20 +11:00
Spigot 4644626cff No need to hard disable. Also tweak check to allow for 1 renderer customs
By: md_5 <md_5@live.com.au>
2013-03-23 20:09:17 +11:00
Spigot 023ba8e359 Compensate for CB always having its own renderer
By: md_5 <md_5@live.com.au>
2013-03-23 19:41:36 +11:00
Spigot 71535cee5a Also allow outright disabling them - we need to clean up all map patches at some point.
By: md_5 <md_5@live.com.au>
2013-03-23 19:32:46 +11:00
Spigot c6c8ed2b6d Remove extra import.
By: md_5 <md_5@live.com.au>
2013-03-23 19:09:47 +11:00
Spigot 271caf9719 Limit Custom Map Rendering
The default CraftBukkit render sequence for maps is ridiculously slow. By only using it when a custom renderer has been added (rarely in most cases), we can fallback to the Vanilla renderer for general usage. This leads to a much higher effiency overall, especially if no plugins are rendering such maps.

By: md_5 <md_5@live.com.au>
2013-03-23 19:08:49 +11:00
Spigot df6fa740d6 Additions to the async operation catching patch.
By: md_5 <md_5@live.com.au>
2013-03-23 18:27:02 +11:00
Spigot 15d914dbf0 Move async checks to their own patch so we can add more of them.
By: md_5 <md_5@live.com.au>
2013-03-23 18:05:22 +11:00
Spigot 8955b40968 Bump thread safety patch up.
By: md_5 <md_5@live.com.au>
2013-03-23 17:56:28 +11:00
Spigot 8129ed16ee CraftBukkit has added this patch, so we can remove it.
By: md_5 <md_5@live.com.au>
2013-03-23 15:41:55 +11:00
Spigot e3bce682f8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-61-g388a299
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-22 23:31:42 -05:00
Spigot 0adb99157f Tweak boat sending even more - might backfire
By: md_5 <md_5@live.com.au>
2013-03-23 13:38:21 +11:00
Spigot 08d3ec390a Entity Tracking Intervals
Send boats at the same speed as their player to remove the illusion of lag / jerkiness.

By: md_5 <md_5@live.com.au>
2013-03-23 13:31:33 +11:00
Spigot 93a74cb902 Texture pack resolutions - Fix issues when specifiying a server texture pack URL with resolution != 16.
By: md_5 <md_5@live.com.au>
2013-03-23 13:05:01 +11:00
Spigot f5af0ba97a Don't aggregate sapling ticks - causes issues.
By: md_5 <md_5@live.com.au>
2013-03-23 12:44:28 +11:00
Spigot 29ee141bf8 BungeeCord support - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
By: md_5 <md_5@live.com.au>
2013-03-23 11:15:28 +11:00
Spigot d404ef3d14 Add setSocketAddress to InetworkManager
By: md_5 <md_5@live.com.au>
2013-03-23 11:06:00 +11:00
Spigot de384ea238 Remove broken saddle pig event
By: md_5 <md_5@live.com.au>
2013-03-23 11:00:20 +11:00
Spigot ba7d059f41 Allow orebfuscated blocks to be specified by the server admin.
By: md_5 <md_5@live.com.au>
2013-03-23 10:58:55 +11:00
Spigot 33b3ecf9d2 Re add ANSI console fixes now that colour stripped logs work correctly
By: James Clarke <jamesrtclarke@me.com>
2013-03-23 10:32:52 +11:00
Spigot bdc2313385 Add a TON of metadata speed / memory fixes and improvements, courtesy of @crast
By: md_5 <md_5@live.com.au>
2013-03-23 10:30:53 +11:00
Spigot 733952dfef Pull CB PR #1073 by @TheCryoknight - Adds BUKKIT-3821 - Fires vehicle events for saddled pigs
By: TheCryoknight <thecryoknight1@gmail.com>
2013-03-23 10:23:23 +11:00
Spigot edeefa8529 Fix BUKKIT-3831, don't call vehicle enter events for unloaded chunks
By: me4502 <mnmiller1@hotmail.com>
2013-03-23 10:16:32 +11:00
Spigot afc740ccf0 Entity Tracking Ranges
By: Aikar <aikar@aikar.co>
2013-03-23 10:12:04 +11:00
Spigot 5fa5beac8e Migrate the crop fixes by @Aikar to the core patch.
By: md_5 <md_5@live.com.au>
2013-03-23 10:08:09 +11:00
Spigot da32cfac56 Abort any existing patches when applying
By: md_5 <md_5@live.com.au>
2013-03-23 10:05:32 +11:00
Spigot 637ef9d41a Add per world view distance which got lost along the way.
By: md_5 <md_5@live.com.au>
2013-03-23 09:55:21 +11:00
Spigot af602bf158 [Cleanup] Update merge patches.
By: md_5 <md_5@live.com.au>
2013-03-23 09:48:22 +11:00
Spigot 6920d2c1f8 [Cleanup] Split the long hash changes into their own patch.
By: md_5 <md_5@live.com.au>
2013-03-23 09:31:28 +11:00
Spigot da42840834 Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-60-gbfdb177
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-22 17:21:45 -05:00
Spigot bc5eb3a011 Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-59-ge869277
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 23:41:39 -05:00
Spigot 64b5ed9e5c Automatically update upstream versions. Bukkit-1.4.7-R1.0-33-g34648c5, CraftBukkit-1.4.7-R1.0-57-g7e17c4e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 21:16:38 -05:00
Spigot 2b4768e91c Automatically update upstream versions. Bukkit-1.4.7-R1.0-32-gf62fbdb, CraftBukkit-1.4.7-R1.0-57-g7e17c4e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 17:01:37 -05:00
Spigot b7451e3081 Automatically update upstream versions. Bukkit-1.4.7-R1.0-32-gf62fbdb, CraftBukkit-1.4.7-R1.0-56-gfbfbc31
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 14:31:44 -05:00
Spigot 815bf98bca Automatically update upstream versions. Bukkit-1.4.7-R1.0-31-g62cc82a, CraftBukkit-1.4.7-R1.0-55-g84a45ed
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 13:56:52 -05:00
Spigot 72dc4ac12e Stage DataWatcher & WatchableObject.
So that we may identify the exact cause of exceptions originating from these classes.

By: md_5 <md_5@live.com.au>
2013-03-21 17:01:03 +11:00
Spigot 0e364e9549 Automatically update upstream versions. Bukkit-1.4.7-R1.0-30-ge416362, CraftBukkit-1.4.7-R1.0-54-gff7c371
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 00:26:42 -05:00
Spigot ad59157c8d Automatically update upstream versions. Bukkit-1.4.7-R1.0-30-ge416362, CraftBukkit-1.4.7-R1.0-53-g2305e00
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 18:11:41 -05:00
Spigot c4165ee243 Merge pull request #24 from TehRainbowGuy/master
Updates spigot to 1.5.1
By: md-5 <md_5@live.com.au>
2013-03-20 15:53:34 -07:00
Spigot 18b5768f30 Automatically update upstream versions. Bukkit-1.4.7-R1.0-29-gd5caa86, CraftBukkit-1.4.7-R1.0-52-gea9f433
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 17:51:41 -05:00
Spigot f370ab8784 Update to 1.5.1
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-03-20 21:54:12 +00:00
Spigot 9a3a09e79b Automatically update upstream versions. Bukkit-1.4.7-R1.0-28-g3d44b71, CraftBukkit-1.4.7-R1.0-51-ge66afce
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 16:31:44 -05:00
Spigot d0aecbe5b8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-50-gd94f0e2
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 11:16:44 -05:00
Spigot d192d9c166 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-49-g0950755
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 10:36:38 -05:00
Spigot 3801a14410 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-48-gdd11b36
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 09:46:53 -05:00
Spigot 25406815cd Update Bukkit version.
By: md_5 <md_5@live.com.au>
2013-03-20 16:52:18 +11:00
Spigot 48496790c8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-25-gad0ccae, CraftBukkit-1.4.7-R1.0-46-gaaa580b
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-19 21:57:28 -05:00
Spigot bad273fe08 Update le patches so that they may henceforth apply cleanly without errors due to the last upstream commit.
By: md_5 <md_5@live.com.au>
2013-03-19 16:51:45 +11:00
Spigot 96d7ce81a7 Automatically update upstream versions. Bukkit-1.4.7-R1.0-24-gf213536, CraftBukkit-1.4.7-R1.0-45-g5c7d0bb
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-19 00:47:21 -05:00
Spigot f2403de900 Automatically update upstream versions. Bukkit-1.4.7-R1.0-24-gf213536, CraftBukkit-1.4.7-R1.0-44-g82d40a0
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:52:23 -05:00
Spigot 79b9627fc8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-21-g5ce29c1, CraftBukkit-1.4.7-R1.0-43-gc9172a4
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:27:23 -05:00
Spigot 6f3f25f827 Automatically update upstream versions. Bukkit-1.4.7-R1.0-21-g5ce29c1, CraftBukkit-1.4.7-R1.0-42-g7b3cf23
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:22:26 -05:00
Spigot 95677bfd79 Automatically update upstream versions. Bukkit-1.4.7-R1.0-20-g8846f9e, CraftBukkit-1.4.7-R1.0-41-g5ebee02
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 18:27:23 -05:00
Spigot a1483db9ca Automatically update upstream versions. Bukkit-1.4.7-R1.0-20-g8846f9e, CraftBukkit-1.4.7-R1.0-40-gd3cf25a
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 17:22:33 -05:00
Spigot 9e37fb091b Automatically update upstream versions. Bukkit-1.4.7-R1.0-19-g4a23f3f, CraftBukkit-1.4.7-R1.0-39-gd7fe50c
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 14:02:27 -05:00
Spigot 105f20085a Implement Travis
By: Zach Bruggeman <zbruggeman@me.com>
2013-03-17 12:04:04 -07:00
Spigot 3fc59cc0ee Automatically update upstream versions. Bukkit-1.4.7-R1.0-19-g4a23f3f, CraftBukkit-1.4.7-R1.0-38-ga73b6e1
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 13:17:36 -05:00
Spigot 082176c726 We should return "" not null for 'corrupt' signs.
By: md_5 <md_5@live.com.au>
2013-03-18 20:33:22 +11:00
Spigot 5ade077442 Prevent NPE in CraftSign
This commit prevents the constructor of CraftSign throwing an NPE when it cannot get the sign tile entity. Instead it will fallback to a 4 empty lined sign, and not try to do anything to those lines on .update().

@TheDgtl

By: md_5 <md_5@live.com.au>
2013-03-18 20:02:03 +11:00
Spigot 4baf879929 Automatically update upstream versions. Bukkit-1.4.7-R1.0-15-g51798af, CraftBukkit-1.4.7-R1.0-34-g484df2d
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 22:31:36 -05:00
Spigot 7ba25d1232 Automatically update upstream versions. Bukkit-1.4.7-R1.0-13-g51da39d, CraftBukkit-1.4.7-R1.0-33-g246aa19
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 20:21:36 -05:00
Spigot 57e4979e31 Automatically update upstream versions. Bukkit-1.4.7-R1.0-13-g51da39d, CraftBukkit-1.4.7-R1.0-32-gd7c4f89
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 13:06:47 -05:00
Spigot cc6e8ab703 Faster UUID for entities
It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.

By: md_5 <md_5@live.com.au>
2013-03-17 19:02:58 +11:00
Spigot f4da5482df Deploy server again. wot eva
By: md_5 <md_5@live.com.au>
2013-03-17 12:27:11 +11:00
Spigot 3a7173aa1b Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-31-g4ff57b2
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 18:36:31 -05:00
Spigot 62e902bbcc Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-30-g55b5fb7
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 18:21:29 -05:00
Spigot 81d0524331 Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-29-ge46c007
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:31:32 -05:00
Spigot fee63691d5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-29-ge46c007
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:16:32 -05:00
Spigot d9002e97ca Update Netty to 4.0.0-Beta3 + reapply patches for new index info.
By: md_5 <md_5@live.com.au>
2013-03-17 09:14:16 +11:00
Spigot 36dd1f54b3 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-28-g35194cb
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:01:30 -05:00