Commit Graph

442 Commits

Author SHA1 Message Date
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