Commit graph

7283 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