Commit Graph

3308 Commits

Author SHA1 Message Date
EcoCityCraft 404dde63f4 Automatically update upstream versions. Bukkit-1.5.1-R0.1-9-g18c4648, CraftBukkit-1.5.1-R0.1-10-g07e33d0 2013-04-11 23:31:24 -05:00
md_5 c7cc53537f Update netty & kindof hacky fix for anvil mishaps 2013-04-12 14:07:22 +10:00
EcoCityCraft 3c9f16cf72 Automatically update upstream versions. Bukkit-1.5.1-R0.1-8-gbe14296, CraftBukkit-1.5.1-R0.1-8-gb87eac0 2013-04-11 21:01:44 -05:00
md_5 7db53a4407 Add @hidendra 's pulls 2013-04-10 17:03:17 +10:00
md_5 db79d01b57 Add written bytes tracking for @bergerkiller 2013-04-10 16:37:43 +10:00
md_5 d9c76252eb Remove stats completely from patches. 2013-04-10 14:08:33 +10:00
md_5 9d224f6036 Fix patches. 2013-04-10 14:06:41 +10:00
md_5 0e9aa34299 [Cosmetic] Update patches to be generated with latest stable git. 2013-04-10 12:36:11 +10:00
md-5 bf674a5279 Merge pull request #33 from Bestle/patch-1
Update 0038-Entity-Tracking-Ranges.patch
2013-04-08 17:06:03 -07:00
Bestle 8276f54c06 Update 0038-Entity-Tracking-Ranges.patch
monsterEntityActivationRange -> monsterTrackingRange
2013-04-09 02:00:09 +02:00
md-5 c7acdbe8ed Merge pull request #30 from TehRainbowGuy/Boat-Dupe
Fixes boat dupe
2013-04-05 14:10:39 -07:00
EcoCityCraft f15bf38692 Automatically update upstream versions. Bukkit-1.5.1-R0.1-8-gbe14296, CraftBukkit-1.5.1-R0.1-7-ge80e64d 2013-04-05 12:56:17 -05:00
Benjamin James Harrison-Sims f36ab707b8 Fixes boat dupe 2013-04-05 18:53:24 +01:00
EcoCityCraft 2d98fbbf6e Automatically update upstream versions. Bukkit-1.5.1-R0.1-7-g5ca534d, CraftBukkit-1.5.1-R0.1-7-ge80e64d 2013-04-05 12:46:20 -05:00
EcoCityCraft c184ee4bef Automatically update upstream versions. Bukkit-1.5.1-R0.1-6-g410bd30, CraftBukkit-1.5.1-R0.1-7-ge80e64d 2013-04-04 23:41:19 -05:00
md_5 87f4ca0e82 remove no longer applying / pulled meta patches 2013-04-04 22:52:57 -05:00
EcoCityCraft 67c3bc37aa Automatically update upstream versions. Bukkit-1.5.1-R0.1-6-g410bd30, CraftBukkit-1.5.1-R0.1-6-ge421b6a 2013-04-04 22:29:19 -05:00
Ammar Askar 3cf9b00282 Fix oreobfuscator patch 2013-04-04 16:08:00 +05:00
Ammar Askar 1fdfed1fb9 Update for upstream version change 2013-04-04 15:58:51 +05:00
Ammar Askar c75792dca3 Update submodules 2013-04-04 15:39:35 +05:00
md-5 43f269a10b Merge pull request #29 from SuperSpyTX/fkinggit
Fix ore update radius 2 (the stupid git fixed version)
2013-04-03 15:16:28 -07:00
SuPaH sPii c77d70f8ea Fix update radius, so I can update my radius to see ores
very far away for no apparent reason I type this very long
 commit message that serves nobody elses purpose except
 Bacon ipsum dolor sit amet pancetta kielbasa turducken
 boudin. Andouille fatback doner hamburger t-bone beef
 brisket chicken turkey. Prosciutto sausage drumstick
 kielbasa, jerky ham tongue brisket venison pork loin
 fatback chuck. Drumstick short loin biltong tenderloin,
 tongue hamburger swine chicken bresaola doner filet mignon.
 Kielbasa jowl filet mignon boudin shankle pork. Capicola
 tri-tip venison, ham hock sirloin filet mignon chuck ham
 pork belly pastrami jerky prosciutto.
2013-04-03 17:10:41 -05:00
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