Commit graph

787 Commits

Autor SHA1 Nachricht Datum
md_5
31e1e0e950 Add outdated client / server messages to config 2013-08-03 18:59:36 +10:00
md_5
381a40a50a Upstream merge 2013-08-03 18:45:50 +10:00
md_5
5462e4c2bb Upstream merge 2013-07-30 07:27:59 +10:00
md_5
2fff7d15c5 Sigh. Back to good old fashioned whatever we had before. Can anyone recommend some xray client I can actually use to test this stuff? 2013-07-28 21:47:45 +10:00
md_5
cb44b83822 Damn I hate mode #2 2013-07-28 20:29:49 +10:00
md_5
a8269a5119 Fix engine mode 2, again 2013-07-28 15:58:10 +10:00
md_5
e5b7d37953 Fix engine mode 2 2013-07-28 08:23:08 +10:00
md_5
7e99854246 1,3 can only be expressed as an integer, not a byte! #logic 2013-07-27 11:56:56 +10:00
md_5
e6c808d887 Add new replacements config for use with anti xray mode 2 2013-07-27 11:48:43 +10:00
md_5
ea574d0315 Fix invalid username patch to disconnect correctly 2013-07-25 17:06:35 +10:00
md_5
5d31ee288a Should probably do an upstream update. 2013-07-24 19:33:10 +10:00
md_5
32eb618d1c Bump netty versions ._. 2013-07-24 17:43:12 +10:00
md_5
6139802e21 Update to Netty 4.0.3 final! 2013-07-19 19:45:54 +10:00
md_5
3e1ce88947 Update to latest CB 2013-07-19 19:35:05 +10:00
Ammar Askar
83732d4ce1 Simplify contains in LongHashSet along with some other minor tweaks 2013-07-19 13:16:32 +05:00
Ammar Askar
b1fafd6a88 Added simple entity ticking caching 2013-07-16 16:24:37 +05:00
md_5
a144cc905b [Anti XRay] Don't trigger updates on the clicked block - fixes block lag caused when mining ores quickly. 2013-07-15 14:14:45 +10:00
md_5
e881f8990f Reset default antixray blocks to remove 1 and 5, to fix block lag people have being seeing. Thanks @andrewkm for the report. 2013-07-13 11:37:21 +10:00
md_5
3005aa33e0 Add additional case for EntityDismountEvent 2013-07-11 16:59:26 +10:00
md_5
c7c08d81ae Remove CraftHorse patch since it is now covered by upstream 2013-07-11 11:33:09 +10:00
md_5
6b60db4272 Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice. 2013-07-11 11:31:30 +10:00
MonsieurApple
ed79b37aaa Fix potion effects not being reset on death. Fixes
BUKKIT-4515
2013-07-11 10:28:04 +10:00
md_5
bc88549f20 Fix client crash with cannot send chat message 2013-07-10 23:46:31 +10:00
ItsHarry
d69d231845 Fixed StructureGrowEvent.getPlayer(); always returning null regardless of whether bone meal was used or not. 2013-07-10 13:48:26 +02:00
md_5
6b3632e736 Remove patch that prevents piston extend event firing twice - causes pistons to eat blocks on some occasions. Thanks Salaman and his team for debugging. 2013-07-09 13:16:16 +10:00
md_5
5a70ec4f37 PendingConnection.c() -> d() 2013-07-09 10:48:33 +10:00
md_5
9018b1d7ba Update Spigot to Minecraft 1.6.2 2013-07-09 10:31:10 +10:00
md_5
3ec60528a2 Update Packet44 to take a snapshot of attributes to prevent concurrent modification leading to bad packets or CMEs. This is a REQURIED update to get support. 2013-07-09 08:29:39 +10:00
md_5
d06a613c2f Change jar name to include 1.6.2 2013-07-08 21:38:44 +10:00
md_5
34c6423083 Minor code cleanup to snapshot protocol - nothing functional 2013-07-08 21:27:56 +10:00
md_5
14d833f8e2 Add missing packet 2013-07-08 21:19:55 +10:00
md_5
b0cbbf81cc 1.6.2 Protocol Support Enabled by Default 2013-07-08 21:17:32 +10:00
md_5
b5ee9871fb Add 1.6 Potion Effects. Thanks @bloodsplat for pointing this out. 2013-07-08 12:37:44 +10:00
md_5
0bab96762d Always call dismount events regardless of Vehicle or not 2013-07-08 09:22:29 +10:00
md_5
8674b1053d Keep CraftServer init early, but make plugins load at approx the same time they do in CraftBukkit - thanks @aadnk for wanting this 2013-07-07 09:33:34 +10:00
md_5
df2ee3e398 Replace MessageList with list, see if we can catch issues. 2013-07-07 09:05:04 +10:00
md_5
a59da621da Ensure packet hooks are called sync - thanks @aadnk for pointing this out 2013-07-07 09:02:13 +10:00
md_5
cd02250065 Did someone say console command completion? These commits were authored by @quickwango and come from Bukkit/Bukkit#868 and Bukkit/CraftBukkit#1151 2013-07-06 09:40:00 +10:00
md_5
87854c51ab Add my "fix" for EntityPersistance, I do believe that removing this check is incorrect and the result of a slight hiccup by Bukkit. 2013-07-05 21:56:07 +10:00
md_5
124d4867c7 Add Type Safety checks for............. sanity....? 2013-07-05 13:19:45 +10:00
md_5
3601ca3da5 Pull a series of CraftBukkit patches - see below for summary and credits:
Bukkit/CraftBukkit#1145 : @Zarius : Don't fire piston extend event twice
Bukkit/CraftBukkit#1174 : @millerkil : Prevent plugins causing ghost players
Bukkit/CraftBukkit#1177 : @jb-aero : Properly set ambient flag for potion effects
2013-07-05 12:22:04 +10:00
Alex Ciuba
693b2872b1 Properly Consume Bonemeal in Dispensers
Don't consume bonemeal if there is no crop in front. Fixes BUKKIT-3790
Pulls Bukkit/CraftBukkit#1172
2013-07-05 12:22:01 +10:00
Mike Primm
a7014a3eb7 Create CraftHorse Instance for EntityHorse
Handle creating instance of CraftHorse for EntityHorse instances and spawn()
Pulls Bukkit/CraftBukkit#1185
2013-07-05 12:22:01 +10:00
md_5
81aee9fec2 Prevent crash on dismount, thanks Salaman for the report! 2013-07-05 12:21:49 +10:00
md_5
bc16626761 Include only the bits of netty we need 2013-07-04 20:14:10 +10:00
md_5
26f85d2572 Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
2013-07-04 20:05:41 +10:00
md_5
6cca81703a Netty CR9 2013-07-04 19:58:09 +10:00
md_5
fec1763e6d Switch index length check around to prevent crashes 2013-07-04 12:11:17 +10:00
md_5
1fbd057e42 Wouldn't it be nice if the console was coloured - actually colour console messages instead of just leaving colour codes. 2013-07-04 10:12:57 +10:00
md_5
3c872410f5 Update again - git isn't as smart as he looks 2013-07-03 14:16:28 +10:00
md_5
63116b317c Update to latest upstream 2013-07-03 14:05:15 +10:00
md_5
d8a5e9ddfd Close Horse Inventory on Disconnect 2013-07-03 08:35:21 +10:00
Benjamin James Harrison-Sims
3590fce0d3 Close horse inventory on logoff to prevent dupe 2013-07-03 08:31:43 +10:00
md_5
54195222b9 Update to latest CraftBukkit - is this more patches without credit I see? 2013-07-03 08:27:18 +10:00
md_5
ab1e1a2a5a Add Entity Mount and Dismount Events - very useful for horses! Thanks @lazertester for the idea! 2013-07-02 20:33:10 +10:00
md_5
f76f65a837 [CraftBukkit] Use correct variable when migrating world so as not to screw up rcon and getServerIP 2013-07-02 20:11:09 +10:00
md_5
fe4ec4e7ad Prevent buffer from being freed prematurely or twice. 2013-07-02 17:31:00 +10:00
md_5
6e333e5df4 Netty errors? What errors? I see no errors..... 2013-07-02 15:33:58 +10:00
md_5
2da1a22e64 Update to netty CR8 2013-07-02 15:31:49 +10:00
md_5
94d29288b5 Fix 1.5 pinging the server - its a bit hacky, but it works! 2013-07-02 15:27:31 +10:00
md_5
f1226f6e13 Fix /reload not functioning - thanks AlexM850 for the report. 2013-07-02 15:14:02 +10:00
md_5
b94f2b8159 Clean nibble arrays patch Packet51 to fix crash bug mentioned by Drumming102 on IRC. 2013-07-02 15:12:49 +10:00
md_5
79d9e36303 Return of the Netty... dun dun dun 2013-07-02 15:06:15 +10:00
md_5
0f94ebdabe Disable netty always - it will be fixed ASAP 2013-07-02 14:30:13 +10:00
md_5
990b604a30 Fix CraftBukkit bug - Actually Use Results of PingEvent 2013-07-02 14:29:18 +10:00
md_5
0c1676e3d4 Update Spigot to 1.6.1 and disable Netty. Be sure to keep backups, we will not be held responsible for your loss! 2013-07-02 13:57:42 +10:00
md_5
667f4b4655 Spigot 1.6.1 - Those who are aware of the risks will figure out how to compile, testing is underway. 2013-07-02 13:45:51 +10:00
md_5
658ae8b3fa Remove skeleton bow shoot patch - needs to be updated 2013-07-02 13:41:40 +10:00
md_5
8752e9f61f Update netty and watchdog 2013-07-02 13:36:58 +10:00
md_5
40a2f5b7ad Finish entity actviation range 2013-07-02 13:34:16 +10:00
md_5
ed6ba2a745 Fix mob spawn patch 2013-07-02 13:24:59 +10:00
md_5
744cbbd49f Fix nibble array patch - we will need to stage Packet51 in the near future 2013-07-02 13:23:38 +10:00
md_5
11056f21c8 Remove patch #15 - optimized chunk unload 2013-07-02 13:21:57 +10:00
md_5
6c93b3cc48 Update particle api mc-dev staged things 2013-07-02 13:17:13 +10:00
md_5
4d2619f099 Remove LocalLanguage patch for now 2013-07-02 13:14:40 +10:00
md_5
5d790af909 Update to Minecraft 1.6.1 - Phase 1 2013-07-02 13:03:56 +10:00
md_5
d3f473de73 Split chunk compression to its own patch. 2013-07-02 09:08:07 +10:00
md_5
ad45efc6ce Remove multiplexing server connection as we do not need it with 1.6 2013-07-02 09:05:40 +10:00
md_5
64a3e2baa5 Use startsWith for spam exclusions 2013-07-01 14:35:48 +10:00
md_5
fff3a4f3f9 No stack traces please 2013-06-30 08:38:54 +10:00
md_5
184ccfa363 Remove slow and complex pipelining and make our own packet writing system. Speed glorious speed. 2013-06-29 17:39:07 +10:00
md_5
b5047135c3 Even nicer throttling + encoding. 2013-06-29 16:27:52 +10:00
md_5
2332de0fda Hey ma, look at my packet encoder! 2013-06-29 16:07:41 +10:00
md_5
d2bde0b68f Update to Netty CR7 - boasts numerous bug fixes and improvements, is sex 2013-06-29 15:36:18 +10:00
md_5
df32b00c1e Simplify close inventory patch 2013-06-29 13:46:41 +10:00
md_5
0bb0ba794f Disallow Interaction With Self 2013-06-28 19:53:05 +10:00
md_5
4bf5a2ead4 Move close inventories patch up 2013-06-28 14:17:59 +10:00
md_5
a40b3f90c7 Properly Close Inventories
Properly close inventories when unloading and switching worlds.
2013-06-27 17:26:20 +10:00
md_5
a87b0db033 Fix potential errors when plugins log with a null message 2013-06-26 16:59:37 +10:00
md_5
26ed947128 Java 1.6 compile support 2013-06-25 18:12:27 +10:00
md_5
8c974b4f67 Always fire PreLoginEvent 2013-06-25 18:09:55 +10:00
md_5
fa4b1f668f Throw exceptions when we can't bind 2013-06-24 12:24:38 +10:00
md_5
1aa048c61e Use our throttle method, diff needs a little bit of work. May be buggy, use with care. 2013-06-24 07:42:20 +10:00
md_5
7b558570ea Flip netty/non netty so correct setting is used, still looking into throttle 2013-06-24 07:35:42 +10:00
md_5
33a79925d8 Comment out unused per-listener throttle 2013-06-23 16:45:43 +10:00
md_5
bdf7193be3 Don't print bind notice twice; throw exception when unable to bind 2013-06-23 16:33:18 +10:00
md_5
7d3f731504 Pull Bukkit/CraftBukkit#1130 - Include result slot in CraftInventoryAnvil.getItem .Fixes BUKKIT-2788 2013-06-23 13:58:40 +10:00
md_5
777dddbc24 Customize server is full message 2013-06-23 11:06:30 +10:00
md_5
c6e50618a8 Add log filtering! 2013-06-23 10:38:51 +10:00
md_5
427d6df4cb I found you, Mr Disable Random Light Updates! 2013-06-22 16:12:17 +10:00
md_5
c4163f30c6 Fix Bungee support 2013-06-22 15:48:42 +10:00
md_5
66a7394806 Add netty-threads option 2013-06-22 14:35:20 +10:00
md_5
6ec312912d Cactus Cactus Cactus Cactus Cactus 2013-06-22 14:16:11 +10:00
md_5
5b3bd96325 Properly re-register commands on reload 2013-06-22 14:07:01 +10:00
md_5
a79c1fc577 Integer cannot be cast to Short :( 2013-06-22 13:59:56 +10:00
md_5
a18171d81c Add a patch to allow configuring and editing some server messages. 2013-06-21 19:22:15 +10:00
md_5
9c2abd8b65 The server loads all settings correctly as far as I can tell. This marks the end of stage 2. Stage 3 (testing of all features and commands) will start tomorrow. 2013-06-21 19:17:26 +10:00
md_5
f6514125a3 Load from correct class 2013-06-21 19:10:58 +10:00
md_5
0962624397 Progress on actually getting stuff to load. 2013-06-21 19:08:32 +10:00
md_5
1e51504654 More static please 2013-06-21 18:57:20 +10:00
md_5
2b3dc8d5a8 *wipes sweat off brow, add /tps and /restart commands 2013-06-21 18:25:45 +10:00
md_5
257cc9648d Add ability to register commands 2013-06-21 18:21:29 +10:00
md_5
1d3a0f7488 Reload support for spigot.yml 2013-06-21 18:14:27 +10:00
md_5
619e564093 Add our tab complete patch back 2013-06-21 18:06:04 +10:00
md_5
3fbe058033 Add our command logging disable patch 2013-06-21 18:01:41 +10:00
md_5
3abc02a4c8 Add our spam filter exclusions patch 2013-06-21 17:59:37 +10:00
md_5
382b024888 Add our enable foreign language in signs patch 2013-06-21 17:53:18 +10:00
md_5
20051065ad Rename next tick list performance patch 2013-06-21 17:50:04 +10:00
md_5
4bda2412ce Rename translation caching patch 2013-06-21 17:47:12 +10:00
md_5
eed7b85ce6 Rename close unloaded save files 2013-06-21 17:46:00 +10:00
md_5
3b7adf24b7 Rename invalid name filter patch 2013-06-21 17:45:10 +10:00
md_5
61dd3c6834 Experimentally remove another patch 2013-06-21 17:42:59 +10:00
md_5
e94f09ff80 Ping sending patch done 2013-06-21 17:41:26 +10:00
md_5
8a883922a8 Merge the two spawn calculation fixes 2013-06-21 17:35:08 +10:00
md_5
20e0c70bd8 More patches 2013-06-21 17:30:13 +10:00
md_5
dce45d252c Redo longhash tweaks 2013-06-21 17:14:11 +10:00
md_5
8cbfcf995d Compiling up to patch 10 2013-06-21 17:00:01 +10:00
md_5
d98522c69d Remove some CraftBukkit pull requests that don't have any functional benefit at the moment. 2013-06-21 16:49:33 +10:00
md_5
c3faaa3d24 Rename Spigot changes patch to growth rates and simplify its contents 2013-06-21 16:47:56 +10:00
md_5
8def048446 Round 1 of Spigot.yml / Spigot Rewrite / Spigot Cleanup is complete! 2013-06-20 19:44:06 +10:00
md_5
4e5ba04a5b Bungee 2013-06-20 19:37:15 +10:00
md_5
715a18a7d9 Netty 2013-06-20 19:23:30 +10:00
md_5
0503dd73fd Metrics and watchdog 2013-06-20 19:07:32 +10:00
md_5
1176626e5e Activation Range 2013-06-20 19:00:26 +10:00
md_5
9d2daf140b Orebfuscator 2013-06-20 18:52:23 +10:00
md_5
9c9a514b77 Merge tweaks 2013-06-20 18:41:59 +10:00
md_5
df45aed819 Rough Spigot Changes 2013-06-20 18:21:31 +10:00
md_5
ba7c6ef6b0 Add more to the config 2013-06-20 18:16:28 +10:00
md_5
ccd447743e Show off some WIP patches. 2013-06-20 17:52:17 +10:00
md_5
919070df83 Simplify 2013-06-20 17:36:06 +10:00
md_5
07b12237b5 Implement yaml load / save methods. 2013-06-20 17:31:40 +10:00
md_5
a36e58024a Reduce packet antispammer as low as we can go. 2013-06-18 18:15:35 +10:00
Robin Lambertz
aa0f27bcd9 Fix Particle API. Fix an NPE occuring if effect.getData is null, and fix the constructor of the Packet63 not using the right arguments. 2013-06-18 12:12:43 +10:00
md_5
6944fc62b9 Downgrade network engine to fix reliability issues 2013-06-17 07:29:49 +10:00
md_5
0c7072f790 Refresh the hashes of all our patches so they are nicely in sync after our new RB. 2013-06-16 21:45:21 +10:00
TomyLobo
a59cfc6379 Fix compilation on Sun JDK (and any other strictly conforming compiler)
http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.12.1
http://ideone.com/MGCWja
2013-06-16 10:18:09 +10:00
md_5
8f3f548e7d Do Not Search for Offline Players
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
2013-06-16 08:21:11 +10:00
md_5
2747aa6e49 Fix loading of per world settings 2013-06-15 22:01:15 +10:00
md_5
f126583c52 Add meta crash fix 2013-06-15 21:35:04 +10:00
Andy Shulman
468ea97414 Implemented Bukkit and CraftBukkit pulls #859 and #1137 respectively 2013-06-15 19:10:13 +10:00
md_5
2083a98e7b Update versions. 2013-06-15 19:08:22 +10:00
md_5
8447f3ec63 Bracket hell, thanks @sleaker. 2013-06-13 15:56:15 +10:00
md_5
8ecb4f1961 Rename some patches to be more concise. More to come once we can think of better names :p 2013-06-11 14:11:48 +10:00
md_5
016520a89f Remove redundant patch 2013-06-11 14:06:05 +10:00
md_5
14a70d4c94 Split out offline player lookups 2013-06-11 14:02:19 +10:00
md_5
45414bbf61 Finish refactoring configuration. The PAIN is over for now 2013-06-11 13:25:58 +10:00
md_5
c4a67b640b Let the PAIN begin 2013-06-11 12:56:24 +10:00
md_5
d7b0d9b514 Split out getCubes patch 2013-06-11 12:18:55 +10:00
md_5
43f3c03491 Slightly prettier patch file 2013-06-11 12:13:28 +10:00
md_5
2fee804892 Split out the better save queue patch 2013-06-11 12:10:31 +10:00
md_5
2d52b62169 Split shutdown hang fix into own patch 2013-06-11 11:54:45 +10:00
md_5
40287791c8 Incorrect brackets.... 2013-06-10 14:10:42 +10:00
md_5
1fd79fc87e Null checks for the sake of nullchecks 2013-06-10 11:38:51 +10:00
md_5
e0ad90304f Fix missing nullcheck in particle API 2013-06-10 10:58:26 +10:00
md_5
f6ecb2c9fa Revert tick loop catch up TPS 2013-06-08 16:14:43 +10:00
md_5
09ec323cc3 Shuffle location of this small mc-dev change 2013-06-08 09:50:30 +10:00
md_5
4fbc447abd Fix patch extras 2013-06-08 09:29:32 +10:00
Aikar
bcae8ccd4a Fix Breeding issues with EAR 2013-06-08 09:27:14 +10:00
Aikar
55b7ca648b Drill down detail of world - doTickRest 2013-06-08 09:21:38 +10:00
Aikar
84089dc4ae Properly report TPS when catching up 2013-06-08 09:20:25 +10:00
md_5
fced81e629 Just under 2 months for CB to pull - new record! 2013-06-04 17:44:12 +10:00
md_5
8cb46db2f3 Yeah.png
Fix build
2013-06-03 17:58:18 +10:00
md_5
6033d89116 [Testing] improve oreobf performance / potentially fix errors (reverse-merged from commit 1d56399e16) 2013-06-03 17:51:31 +10:00
md_5
3f52d8364c Fix skeleton event 2013-06-02 16:47:46 +10:00
md_5
62a02a4422 Hopper cooldowns - patch #50! 2013-06-02 16:24:20 +10:00
md_5
bb85281118 Add additional particle API. Thanks thinkofdeath! 2013-06-02 16:15:22 +10:00
md_5
fc6cfcb21a Update Bungee support to new patch. This is breaking. 2013-06-02 15:22:22 +10:00
md_5
20f62305d1 Implement the arrow API 2013-06-02 15:16:19 +10:00
md_5
e9757fa533 Add a skeleton api impl to show how spigot specific APIs will be made 2013-06-02 15:15:15 +10:00
md_5
606c18471c Fix entity shoot bow event with skeletons - thanks Sleaker! 2013-06-02 15:04:52 +10:00
md_5
aac00c190d Add fix for health scaling - courtesy of Sleaker 2013-06-02 14:55:02 +10:00
md_5
9ae1c5ab77 Try and address the reliability of netty 2013-06-02 14:43:20 +10:00
md_5
f93f827d2d Dont throttle twice 2013-06-02 11:52:13 +10:00
md_5
cbd0e009ee Find + replace saves the day 2013-06-02 11:33:49 +10:00
md_5
723bd01ccb Recipe Deconstruction
Some non API methods contributed by Asphodan to allow recipe deconstruction.
2013-06-01 16:34:52 +10:00
md_5
1d56399e16 [Testing] improve oreobf performance / potentially fix errors 2013-06-01 16:13:33 +10:00
md_5
53d9d1734b Small cleanups to netty 2013-06-01 14:23:53 +10:00
md_5
fdd25ff498 Format netty patch 2013-06-01 13:57:16 +10:00
md_5
829a3e9181 Allow 0 entity trackign range. Use at own risk 2013-05-31 17:10:16 +10:00
md_5
e710c42e46 Fix issue with plugins sending plugin messages causing login to hang - often seen in bukkit->bungee plugins 2013-05-28 07:21:11 +10:00
md_5
0ee7a72ac8 Bump Netty version - it contains a fix for an issue some users have seen. 2013-05-27 16:26:02 +10:00
md_5
007aa958d2 Bump rate limit down to 3 (from 5) 2013-05-25 15:40:34 +10:00
md_5
05db99ce17 Add better APIs for bungee raw IP 2013-05-21 20:45:44 +10:00
md_5
950af1102e [Experimental] Update to netty CR3. 2013-05-21 11:28:02 +10:00
md_5
e34a5fbdad Remove -o Option
Serves no purpose other than to confuse users.
2013-05-19 18:44:45 +10:00
md_5
694dfbd313 Guard against NPE when getting real IP 2013-05-19 17:58:42 +10:00
md_5
9b7d8d544e Downgrade to Netty CR1 2013-05-19 17:57:29 +10:00
md_5
3d4d83088b Orebfuscator fully functioning, more effective, more efficient! 2013-05-16 20:05:49 +10:00
md_5
88be08f36a Should use > instead of != for consistancy. There are a few more checks I want to optimize, but for now I will avoid them in case I have broken anything today 2013-05-16 19:34:00 +10:00
md_5
75c1783647 The following methods already handle these cases 2013-05-16 19:24:54 +10:00
md_5
b4dc7117c7 Reformat orebfuscator code / rework for easy reading 2013-05-16 19:21:46 +10:00
md_5
6d6ebe7c7c Update orebfuscator 2013-05-16 18:51:25 +10:00
md_5
24da21efb1 Cleanup comments on orebfuscator patch 2013-05-16 18:16:30 +10:00
md_5
5aa5d164a2 Add javassist depend for better performance 2013-05-16 18:11:03 +10:00
md_5
2a4600c6f0 Implement changes to orebfuscator, including remove update radius configuration and update on player interact 2013-05-16 18:10:23 +10:00
md_5
03ddea9fb6 Revert changes to orebfuscator radius 2013-05-16 17:56:35 +10:00
md_5
195739fcd6 No memory leaks please 2013-05-16 16:58:18 +10:00
md_5
2bf8194e41 Update to latest Netty 2013-05-16 16:41:34 +10:00
md_5
6fd3486dab Add IP for players raw IP address 2013-05-14 21:14:43 +10:00
md_5
4b7af7558c Re order 2013-05-14 12:11:20 +10:00
md_5
f2d34e09b4 Add base patch for Spigot config 2013-05-14 12:08:11 +10:00
md_5
244f3cdf58 Set flushnow to true before writing kicks 2013-05-11 15:38:04 +10:00
Mike Primm
45cacdd49b Reimpliment next-tick-list scale improvements 2013-05-08 09:59:08 -05:00
md_5
076af791cc Fixed latest patch, thanks snowleo! 2013-05-08 18:57:48 +10:00
snowleo
f000c40643 Optimized version of LocaleLanguage
This patch reduces the memory footprint of each EntityPlayer by about 300 KB. The original class looks very unfinished and future versions might use the commented code.
2013-05-08 12:13:23 +10:00
snowleo
47948740e9 Stage LocalLanguage to mc-dev 2013-05-08 12:04:50 +10:00
md_5
c46e5feda8 *correct patch 2013-05-04 10:30:39 +10:00
md_5
88919fb452 Don't skip item ticks 2013-05-04 10:14:25 +10:00
md_5
12c6783767 Let frames be configured for tracking 2013-05-04 10:11:32 +10:00
md_5
51ed9f651d Update to latest upstream 2013-05-04 09:24:53 +10:00
md_5
b27b79c7ac Add async check we potentially missed 2013-05-01 16:40:23 +10:00
md_5
89c99e9d28 [CAUTION] Initial 1.5.2 update - I have NOT had time to TEST. DO NOT use on production server WITHOUT TESTING FIRST. 2013-05-01 08:40:33 +10:00
md_5
84a4f0033e [Revert previous experimental commit] All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. All write and no tick makes Jack a dull boy. 2013-04-28 19:52:35 +10:00
md_5
f5a5b2bd76 Increment written bytes value 2013-04-28 08:31:08 +10:00
md_5
8a035561c6 [EXPERIMENTAL] Take #3 at an even better / faster buffering system, use at own peril! 2013-04-27 22:13:33 +10:00
Antony Riley
fb51e3066b Fixes BUKKIT-3893 - Close world save files when world is
unloaded.
2013-04-26 20:35:16 +10:00
md_5
8cea336290 Remove snapshot protocol patch as it will be near impossible to emulate under 1.5 2013-04-26 18:02:57 +10:00
md_5
b56cd7fd98 Reduce flush time to 10 2013-04-25 10:28:05 +10:00
md_5
70436044aa End login process for filtered IPs 2013-04-25 10:01:30 +10:00
md_5
206d24fadd Remove flush time setter up 2013-04-25 09:55:05 +10:00
md_5
9a8d24e247 Use spoofed addresses for events 2013-04-25 09:42:40 +10:00
md_5
846f75ccea Perfect outbound rate limiter. 2013-04-25 09:33:14 +10:00
md_5
391a4159dd Clean up imports in the Spigot class. 2013-04-25 09:01:05 +10:00
md_5
3dcab711e3 Fix disabled netty again 2013-04-24 21:40:18 +10:00
md_5
3d29043ccb Correctly register pending connection when using legacy network handler. 2013-04-23 19:07:40 +10:00
md_5
57cabfb59d Set TCP nodelay to false for Netty 2013-04-23 18:45:12 +10:00
md_5
8614adffd3 Add thread naes to their own patch. 2013-04-23 11:50:42 +10:00
md_5
18520d21b2 Remove extra inventory close event patch, because despite being a legitimate bug fix, it will not be pulled by Bukkit, so plugins must resort to other means to catch this last event. 2013-04-23 11:37:51 +10:00
md_5
7c8c784aab FIx spacing 2013-04-23 11:35:18 +10:00
md_5
ce45aa074e Move version resolve check to initial POM patch 2013-04-23 11:32:07 +10:00
md_5
7f8fbc165b Move IP filter to own patch and (messily) fix merge conflicts as a result. 2013-04-23 11:27:55 +10:00
Ammar Askar
e393db48e6 Go back to the chunk based count caching for now to avoid mob spawning issues 2013-04-22 03:47:35 +05:00
md_5
699a27f6bc Fix world info showing world as always obfuscated 2013-04-21 20:02:08 +10:00
md_5
83ded01371 Revert "Readd previous Netty tweaks, the memory leak has been fixed"
This reverts commit d7ccd34e50.
2013-04-21 10:21:35 +10:00
md_5
d7ccd34e50 Readd previous Netty tweaks, the memory leak has been fixed 2013-04-21 08:53:15 +10:00
md_5
160e82139d Revert "Dramatically reduce the idle network activity by collecting and framing packets for a max of 10 milliseconds. This reduces bandwidth consumption as much as possible whilst not generating network garbage and other nasties."
This reverts commit 95cd0996c0.
2013-04-21 08:39:39 +10:00
md_5
ceccdbcc80 Revert "20 ms works too, anything higher is a bit shifty"
This reverts commit 2471de6147.
2013-04-21 08:39:36 +10:00
Ammar Askar
0436193bc8 Take the count mapping one step further by removing chunk traversal for count seeking altogether 2013-04-21 00:26:53 +05:00
md_5
2471de6147 20 ms works too, anything higher is a bit shifty 2013-04-20 19:50:59 +10:00
md_5
95cd0996c0 Dramatically reduce the idle network activity by collecting and framing packets for a max of 10 milliseconds. This reduces bandwidth consumption as much as possible whilst not generating network garbage and other nasties. 2013-04-20 19:42:04 +10:00
Ammar Askar
713fe4fb2d Store creature counts to avoid repeated assignable checks and traversal of entity slices 2013-04-20 13:50:09 +05:00
md_5
f962379477 Java 5/6 compat. NETBEANS! 2013-04-20 17:14:54 +10:00
md_5
fc6f817452 Oops. 2013-04-19 21:08:35 +10:00
md_5
566e67a188 Welcome back snapshot protocol patch! Now 30% more reliable than a leading brand of car cleaner! Testers welcome <3 2013-04-19 19:14:11 +10:00
md_5
b9d0fab579 [Experimental] Add connection multiplexer to allow many listen blocks. Secondary listen blocks are configured in bukkit.yml 2013-04-19 17:46:00 +10:00
SuPaH sPii
296620b306 Implement a "proper" connection throttle for netty.
Proper meaning a simple portover from CraftBukkit's implementation.

The last implementation had a few issues:
- For each server ping, the connection was getting throttled.
- ConcurrentHashMap is heavy (More of an opinion but don't judge)

From the last implementation, the connection throttle entry (your IP) wasn't getting removed from the list after a server ping, which is supposed to happen according to the original implementation.
2013-04-19 17:45:59 +10:00
md_5
165164f5ab Yet another CraftBukkit pulled patch. 2013-04-16 18:44:58 +10:00
Ammar Askar
9d524e7755 Changed minimum characters to 2 for validity check 2013-04-14 21:37:40 +05:00
md_5
7955ab6342 Fix first connect mostly failing because it is apparently that big of an issue for some people. 2013-04-14 19:34:10 +10:00
Benjamin James Harrison-Sims
9a75a123f5 Use Pattern 2013-04-14 03:25:35 +01:00
Benjamin James Harrison-Sims
4cc6854a67 Prevent handshake spam from invalid names. 2013-04-14 03:09:29 +01:00
md_5
079dc61259 Now that thats out the way.. 2013-04-13 17:14:56 +10:00
md_5
5f4cf224b6 Re add ping sending patch 2013-04-13 17:11:24 +10:00
md_5
010f3ea2b0 Remove a fair chunk of existing patches now applied to CraftBukkit 2013-04-13 17:06:23 +10:00
md_5
c7cc53537f Update netty & kindof hacky fix for anvil mishaps 2013-04-12 14:07:22 +10: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
Bestle
8276f54c06 Update 0038-Entity-Tracking-Ranges.patch
monsterEntityActivationRange -> monsterTrackingRange
2013-04-09 02:00:09 +02:00
Benjamin James Harrison-Sims
f36ab707b8 Fixes boat dupe 2013-04-05 18:53:24 +01: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
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
Ammar Askar
cd0d93011a Revert commit 08297bfb47. Needs more testing. 2013-03-29 14:07:46 +05: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
md_5
b8cbe00de0 Just send kick packet + dc players on restart. Don't actually kick them 2013-03-28 18:38:42 +11:00
Benjamin James Harrison-Sims
08297bfb47 Implement connection throttling in netty. 2013-03-27 04:02:52 +00: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
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
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
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
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
md_5
c57fa19eea Remove broken saddle pig event 2013-03-23 11:01:00 +11:00
md_5
d9f3cf3f2c Allow orebfuscated blocks to be specified by the server admin. 2013-03-23 10:58:55 +11:00
James Clarke
2420de3be3 Re add ANSI console fixes now that colour stripped logs work correctly 2013-03-23 10:32:52 +11:00
TheCryoknight
4d4d0ef929 Pull CB PR #1073 by @TheCryoknight - Adds BUKKIT-3821 - Fires vehicle events for saddled pigs 2013-03-23 10:23:23 +11:00
me4502
2db4c72233 Fix BUKKIT-3831, don't call vehicle enter events for unloaded chunks 2013-03-23 10:16:32 +11:00
Aikar
365305a580 Entity Tracking Ranges 2013-03-23 10:12:04 +11:00
md_5
ec3ddef746 Migrate the crop fixes by @Aikar to the core patch. 2013-03-23 10:08:09 +11:00
md_5
3f493d0785 Add per world view distance which got lost along the way. 2013-03-23 09:55:21 +11:00
md_5
6b53aa10e3 [Cleanup] Update merge patches. 2013-03-23 09:48:22 +11:00
md_5
dca885cdb8 [Cleanup] Split the long hash changes into their own patch. 2013-03-23 09:31:28 +11:00
md_5
ef3a64eea4 Stage DataWatcher & WatchableObject.
So that we may identify the exact cause of exceptions originating from these classes.
2013-03-21 17:01:03 +11:00
Benjamin James Harrison-Sims
49fd03bf60 Update to 1.5.1 2013-03-20 22:13:12 +00:00
md_5
5eed8ed8f0 Update le patches so that they may henceforth apply cleanly without errors due to the last upstream commit. 2013-03-19 16:51:45 +11:00
md_5
218385995f We should return "" not null for 'corrupt' signs. 2013-03-18 20:33:22 +11:00
md_5
f0360d468e 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
2013-03-18 20:03:09 +11:00
md_5
92e0c1e9af 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.
2013-03-17 19:02:58 +11:00
md_5
a97c5a42d6 Deploy server again. wot eva 2013-03-17 12:27:37 +11:00
md_5
33c2a517ec Update Netty to 4.0.0-Beta3 + reapply patches for new index info. 2013-03-17 09:14:16 +11:00
md_5
184d1801e6 Fix isDamaged check for backwards compat 2013-03-16 11:57:39 +11:00
md_5
75f3e084ad Update Spigot to version 1.5. By using this build you agree to the following terms: (read next line)
1) You will not hold SpigotMC responsible for any losses or damages incurred to you by using this build
2) You will report ALL bugs to SpigotMC and not other parties

Thanks for all the support and all parties who made this update possible; especially the awesome Spigot community. Sorry for the delay, but we had to fix some crucial bugs.

Regressions in this commit:
@mikeprimm's smarter chunk ticking patch has been removed as it prevents proper redstone and other block ticking logic.
2013-03-16 10:24:13 +11:00
md_5
4c8d497932 Cleanup patch 2013-03-16 10:11:01 +11:00
md_5
b8cb45d88d Finish up the patches for 1.5. Now to test. 2013-03-16 09:09:32 +11:00
md_5
6e1c16aed8 Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p 2013-03-16 08:35:56 +11:00
md_5
c297cddeb3 Remove ANSI patch from @jrtc27 for now, breaks log strip colours. 2013-03-15 20:49:12 +11:00
md_5
71978f3a0e Strip colours from logs when enabled. 2013-03-15 20:46:16 +11:00
md_5
ac5e97d4e5 Fix stripping colours in console logs. 2013-03-14 19:15:38 +11:00
md_5
e2cf0f7076 Rename ambiguous methods. 2013-03-14 16:32:15 +11:00
md_5
cd442c75db Reapply Container.java CraftBukkit patches, but with 1.5 logic. This fixes crafting and other issues. 2013-03-14 16:25:03 +11:00
Runemoro
a3978b527d Restart even if restart script is not found 2013-03-13 18:29:08 +11:00
md_5
a5cd0b0255 Undo all that encryption faff - NioBuffers arent for the job. 2013-03-12 17:26:16 +11:00
md_5
8ef8327c62 Another shot at encryption - thanks to all those testers, getting this right is important for BungeeCord! 2013-03-12 07:29:37 +11:00
md_5
bb34dba455 Take #12312 at faster encryption - a brave soul who doesnt mind a minute or 2 of downtime should try 2013-03-11 20:30:38 +11:00
md_5
825ae6c6ba Fix patch name. 2013-03-11 20:08:41 +11:00
md_5
72123ab9a3 Update snapshot version. 2013-03-11 19:14:10 +11:00
md_5
c8b552e908 Revert "Use blazingly fast encryption."
This reverts commit 3d85d6b42f.
2013-03-11 18:45:25 +11:00
md_5
3d85d6b42f Use blazingly fast encryption. 2013-03-11 09:53:34 +11:00
md_5
9c18df62b7 Thread safety.
Adds thread safety for chunk load / unload methods.
2013-03-07 20:12:53 +11:00
md_5
3c54fa95be Rename generated repo, and only deploy API, not server. 2013-03-07 17:49:54 +11:00
md-5
6a61d27c10 Quick fix damage event 2013-03-05 07:22:03 +11:00
md_5
2faef00909 Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be. 2013-03-04 18:49:59 +11:00
md_5
c1b617ddc8 Fix errors in command block commands crashing the server. 2013-03-03 20:23:04 +11:00
md_5
0edbf1f0d8 CB has now merged the commits we pulled, so they can be removed. 2013-03-03 09:38:38 +11:00
md_5
36cebc5b7c Fix snapshot support. 2013-03-02 17:27:44 +11:00
md_5
ef9bf59cb6 Add configurable 13w09c protocol support. 2013-03-02 13:34:52 +11:00
md_5
6164c0bd18 Rename connection timing to accurately reflect what is actually being timed. 2013-03-02 10:40:13 +11:00
md_5
3345b8b177 Pull CraftBukkit #1007 from @jrtc27 - console formatting now replicates Minecraft properly. 2013-03-02 10:07:29 +11:00
md_5
0920b554f4 Pull CraftBukkit #1043 by @YLivay - addresses incorrect info returned to plugins in the dispense event. 2013-03-02 09:47:17 +11:00
md_5
0c77bff298 Pull CraftBukkit #1042 by @YLivay - addresses players glitching when the sleep whilst being marked as faux sleepers. 2013-03-02 09:43:59 +11:00