Commit Graph

436 Commits

Author SHA1 Message Date
Hudson
acc7e2172b revert changes to disabled plugins and scheduler.
sorry for messy commit,doing via tablet on ssh
md_5
2013-04-03 02:20:29 -05:00
EcoCityCraft
d16026c850 Automatically update upstream versions. Bukkit-1.4.7-R1.0-45-g409595c, CraftBukkit-1.4.7-R1.0-91-g5bbee6c 2013-04-02 16:16:24 -05:00
EcoCityCraft
11da30ef33 Automatically update upstream versions. Bukkit-1.4.7-R1.0-45-g409595c, CraftBukkit-1.4.7-R1.0-90-geb2d96b 2013-04-01 23:21:17 -05:00
EcoCityCraft
143f7ca90f Automatically update upstream versions. Bukkit-1.4.7-R1.0-44-g10c1edc, CraftBukkit-1.4.7-R1.0-90-geb2d96b 2013-04-01 16:06:30 -05:00
EcoCityCraft
1cba7d67f5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-90-geb2d96b 2013-04-01 00:11:21 -05:00
EcoCityCraft
aaa50df93b Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-89-g259b840 2013-03-31 19:51:16 -05:00
EcoCityCraft
a769ad69c0 Automatically update upstream versions. Bukkit-1.4.7-R1.0-43-g9e614c1, CraftBukkit-1.4.7-R1.0-88-gb39ef5e 2013-03-31 19:36:16 -05:00
EcoCityCraft
06c0fea3b5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-42-g7c8d3d4, CraftBukkit-1.4.7-R1.0-88-gb39ef5e 2013-03-31 19:26:20 -05:00
EcoCityCraft
3aa6e31eae Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-86-g052e955 2013-03-31 15:41:19 -05:00
EcoCityCraft
65db737c4f Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-85-g317e6b6 2013-03-31 13:31:21 -05:00
EcoCityCraft
59647d7d29 Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-83-gb08af02 2013-03-30 02:56:19 -05:00
EcoCityCraft
0e447f047b Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-82-g600f688 2013-03-29 22:51:17 -05:00
EcoCityCraft
a3aa274f0b Automatically update upstream versions. Bukkit-1.4.7-R1.0-41-gf30d89a, CraftBukkit-1.4.7-R1.0-81-g7710efc 2013-03-29 22:31:23 -05:00
Ammar Askar
cd0d93011a Revert commit 08297bfb47. Needs more testing. 2013-03-29 14:07:46 +05:00
md-5
3f7f3a8d31 Merge pull request #27 from agaricusb/fix-nibblearray4096
Fix lightened nibble array getChunkSnapshot on extended block IDs
2013-03-28 23:10:04 -07:00
Agaricus
1062104604 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
2013-03-28 22:15:38 -07:00
EcoCityCraft
7ba7544717 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-79-gb8f8ec0 2013-03-28 21:21:13 -05:00
EcoCityCraft
d8a64c51aa Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-77-gaaaac47 2013-03-28 20:16:09 -05:00
EcoCityCraft
0225aa3d50 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-76-g0802c7e 2013-03-28 19:46:13 -05:00
md_5
b8cbe00de0 Just send kick packet + dc players on restart. Don't actually kick them 2013-03-28 18:38:42 +11:00
EcoCityCraft
fbd6860742 Automatically update upstream versions. Bukkit-1.4.7-R1.0-40-gced8459, CraftBukkit-1.4.7-R1.0-75-g7f25632 2013-03-27 20:32:06 -05:00
md-5
0175fd1a17 Merge pull request #26 from TehRainbowGuy/dos
Implement connection throttling in netty.
2013-03-26 23:38:33 -07:00
Benjamin James Harrison-Sims
08297bfb47 Implement connection throttling in netty. 2013-03-27 04:02:52 +00:00
EcoCityCraft
1864ea15cf Automatically update upstream versions. Bukkit-1.4.7-R1.0-39-gc84d619, CraftBukkit-1.4.7-R1.0-75-g7f25632 2013-03-26 15:35:14 -05:00
md_5
4044f7b7e0 Check connected state before handling packets. 2013-03-26 12:09:44 +11:00
md_5
dda49a9d05 Update to latest CB upstream. 2013-03-25 19:04:51 +11:00
EcoCityCraft
a0b8081a31 Automatically update upstream versions. Bukkit-1.4.7-R1.0-37-g9a0cafe, CraftBukkit-1.4.7-R1.0-69-gd9f4d57 2013-03-25 01:57:57 -05:00
md_5
284847cd81 Close Minecart containers on Entity portal. 2013-03-24 18:53:01 +11:00
md_5
2314af8cb0 Remove upstream pulled patch. 2013-03-24 12:01:40 +11:00
EcoCityCraft
8fac398c63 Automatically update upstream versions. Bukkit-1.4.7-R1.0-35-g34239ae, CraftBukkit-1.4.7-R1.0-63-gace8206 2013-03-23 17:32:25 -05:00
md_5
6eebb4f371 Revert second addition to boat sending patch. 2013-03-24 08:20:01 +11:00
Ammar Askar
fbf4580cd2 Remove patch for upstream merge 2013-03-23 23:37:23 +05:00
EcoCityCraft
5942d62aa5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-62-g40cbc3d 2013-03-23 12:06:45 -05:00
totokaka
148b8e111b Made the world info possible to turn off. 2013-03-23 20:15:20 +11:00
md_5
9009752f7c No need to hard disable. Also tweak check to allow for 1 renderer customs 2013-03-23 20:10:13 +11:00
md_5
338d2617e7 Compensate for CB always having its own renderer 2013-03-23 19:41:36 +11:00
md_5
271ebc28ba Also allow outright disabling them - we need to clean up all map patches at some point. 2013-03-23 19:32:46 +11:00
md_5
625b08c947 Remove extra import. 2013-03-23 19:09:47 +11:00
md_5
7ded14ad0a 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.
2013-03-23 19:08:49 +11:00
md_5
ab31621dc0 Additions to the async operation catching patch. 2013-03-23 18:27:02 +11:00
md_5
cca2920506 Move async checks to their own patch so we can add more of them. 2013-03-23 18:05:22 +11:00
md_5
a028c277bf Bump thread safety patch up. 2013-03-23 17:56:28 +11:00
md_5
e4e3f4e172 CraftBukkit has added this patch, so we can remove it. 2013-03-23 15:41:55 +11:00
EcoCityCraft
9ca3ba6b7d Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-61-g388a299 2013-03-22 23:31:42 -05:00
md_5
a10802976f Tweak boat sending even more - might backfire 2013-03-23 13:38:21 +11:00
md_5
d3ae3c4575 Entity Tracking Intervals
Send boats at the same speed as their player to remove the illusion of lag / jerkiness.
2013-03-23 13:31:33 +11:00
md_5
62361b1359 Texture pack resolutions - Fix issues when specifiying a server texture pack URL with resolution != 16. 2013-03-23 13:05:01 +11:00
md_5
03d244eef1 Don't aggregate sapling ticks - causes issues. 2013-03-23 12:44:28 +11:00
md_5
b28b270dcd 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. 2013-03-23 11:15:28 +11:00
md_5
f05fd55bcc Add setSocketAddress to InetworkManager 2013-03-23 11:06:00 +11:00