Commit graph

524 commits

Author SHA1 Message Date
Spigot
6c3e670871 Fix missing nullcheck in particle API
By: md_5 <md_5@live.com.au>
2013-06-10 10:58:26 +10:00
Spigot
7487505a4d Revert tick loop catch up TPS
By: md_5 <md_5@live.com.au>
2013-06-08 16:14:43 +10:00
Spigot
ec186959e8 Shuffle location of this small mc-dev change
By: md_5 <md_5@live.com.au>
2013-06-08 09:50:30 +10:00
Spigot
cd95751dc4 Fix patch extras
By: md_5 <md_5@live.com.au>
2013-06-08 09:29:32 +10:00
Spigot
1bda949c57 Fix Breeding issues with EAR
By: Aikar <aikar@aikar.co>
2013-06-08 09:27:14 +10:00
Spigot
50d1ab0cfd Drill down detail of world - doTickRest
By: Aikar <aikar@aikar.co>
2013-06-08 09:21:38 +10:00
Spigot
7a96ad8928 Properly report TPS when catching up
By: Aikar <aikar@aikar.co>
2013-06-08 09:20:25 +10:00
Spigot
256b9015c4 Just under 2 months for CB to pull - new record!
By: md_5 <md_5@live.com.au>
2013-06-04 17:44:12 +10:00
Spigot
cfb0c5401f Yeah.png
Fix build

By: md_5 <md_5@live.com.au>
2013-06-03 17:58:18 +10:00
Spigot
85b7bece73 [Testing] improve oreobf performance / potentially fix errors (reverse-merged from commit 9e332f745e)
By: md_5 <md_5@live.com.au>
2013-06-03 17:51:31 +10:00
Spigot
66eaf9b52b Fix skeleton event
By: md_5 <md_5@live.com.au>
2013-06-02 16:47:46 +10:00
Spigot
c84e1f9230 Hopper cooldowns - patch #50!
By: md_5 <md_5@live.com.au>
2013-06-02 16:24:20 +10:00
Spigot
a4ecfdf61c Add additional particle API. Thanks thinkofdeath!
By: md_5 <md_5@live.com.au>
2013-06-02 16:15:22 +10:00
Spigot
ba4eb1ba79 Update Bungee support to new patch. This is breaking.
By: md_5 <md_5@live.com.au>
2013-06-02 15:22:22 +10:00
Spigot
a614b7af96 Implement the arrow API
By: md_5 <md_5@live.com.au>
2013-06-02 15:16:19 +10:00
Spigot
1a372ae112 Add a skeleton api impl to show how spigot specific APIs will be made
By: md_5 <md_5@live.com.au>
2013-06-02 15:15:15 +10:00
Spigot
01403af0b1 Fix entity shoot bow event with skeletons - thanks Sleaker!
By: md_5 <md_5@live.com.au>
2013-06-02 15:01:04 +10:00
Spigot
5f9489a272 Add fix for health scaling - courtesy of Sleaker
By: md_5 <md_5@live.com.au>
2013-06-02 14:49:24 +10:00
Spigot
4b5e76bc22 Try and address the reliability of netty
By: md_5 <md_5@live.com.au>
2013-06-02 14:43:20 +10:00
Spigot
715a3ef9e7 Dont throttle twice
By: md_5 <md_5@live.com.au>
2013-06-02 11:52:13 +10:00
Spigot
fb624b9c57 Find + replace saves the day
By: md_5 <md_5@live.com.au>
2013-06-02 11:29:44 +10:00
Spigot
26fa79baa7 Recipe Deconstruction
Some non API methods contributed by Asphodan to allow recipe deconstruction.

By: md_5 <md_5@live.com.au>
2013-06-01 16:34:52 +10:00
Spigot
9e332f745e [Testing] improve oreobf performance / potentially fix errors
By: md_5 <md_5@live.com.au>
2013-06-01 16:13:33 +10:00
Spigot
f29f254728 Small cleanups to netty
By: md_5 <md_5@live.com.au>
2013-06-01 14:23:53 +10:00
Spigot
8ae13afb25 Format netty patch
By: md_5 <md_5@live.com.au>
2013-06-01 13:57:16 +10:00
Spigot
efb6fb9413 Allow 0 entity trackign range. Use at own risk
By: md_5 <md_5@live.com.au>
2013-05-31 17:10:16 +10:00
Spigot
3b84dc909c Fix issue with plugins sending plugin messages causing login to hang - often seen in bukkit->bungee plugins
By: md_5 <md_5@live.com.au>
2013-05-28 07:21:11 +10:00
Spigot
34e3cc2d96 Bump Netty version - it contains a fix for an issue some users have seen.
By: md_5 <md_5@live.com.au>
2013-05-27 16:26:02 +10:00
Spigot
deee90fda3 Bump rate limit down to 3 (from 5)
By: md_5 <md_5@live.com.au>
2013-05-25 15:40:34 +10:00
Spigot
3d8143b040 Add better APIs for bungee raw IP
By: md_5 <md_5@live.com.au>
2013-05-21 20:45:44 +10:00
Spigot
56383ef26a [Experimental] Update to netty CR3.
By: md_5 <md_5@live.com.au>
2013-05-21 11:28:02 +10:00
Spigot
858e72c656 Remove -o Option
Serves no purpose other than to confuse users.

By: md_5 <md_5@live.com.au>
2013-05-19 18:30:26 +10:00
Spigot
eeff0b7f51 Guard against NPE when getting real IP
By: md_5 <md_5@live.com.au>
2013-05-19 17:58:42 +10:00
Spigot
4d138bdaa5 Downgrade to Netty CR1
By: md_5 <md_5@live.com.au>
2013-05-19 17:57:29 +10:00
Spigot
d98a98397e Orebfuscator fully functioning, more effective, more efficient!
By: md_5 <md_5@live.com.au>
2013-05-16 20:05:02 +10:00
Spigot
b6318e5188 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
By: md_5 <md_5@live.com.au>
2013-05-16 19:34:00 +10:00
Spigot
c54032ce8f The following methods already handle these cases
By: md_5 <md_5@live.com.au>
2013-05-16 19:24:54 +10:00
Spigot
90cbaa91e0 Reformat orebfuscator code / rework for easy reading
By: md_5 <md_5@live.com.au>
2013-05-16 19:21:46 +10:00
Spigot
4b47d73deb Update orebfuscator
By: md_5 <md_5@live.com.au>
2013-05-16 18:51:25 +10:00
Spigot
a2ef7eb02a Cleanup comments on orebfuscator patch
By: md_5 <md_5@live.com.au>
2013-05-16 18:16:30 +10:00
Spigot
276478238f Add javassist depend for better performance
By: md_5 <md_5@live.com.au>
2013-05-16 18:11:03 +10:00
Spigot
1066f25c4c Implement changes to orebfuscator, including remove update radius configuration and update on player interact
By: md_5 <md_5@live.com.au>
2013-05-16 18:10:23 +10:00
Spigot
6771fc09de Revert changes to orebfuscator radius
By: md_5 <md_5@live.com.au>
2013-05-16 17:56:35 +10:00
Spigot
d2197bb6ae No memory leaks please
By: md_5 <md_5@live.com.au>
2013-05-16 16:58:18 +10:00
Spigot
423091f474 Update to latest Netty
By: md_5 <md_5@live.com.au>
2013-05-16 16:41:34 +10:00
Spigot
10fa63149b Add IP for players raw IP address
By: md_5 <md_5@live.com.au>
2013-05-14 21:14:43 +10:00
Spigot
bb9e1c8d34 Re order
By: md_5 <md_5@live.com.au>
2013-05-14 12:11:20 +10:00
Spigot
4f8fb69205 Add base patch for Spigot config
By: md_5 <md_5@live.com.au>
2013-05-14 12:08:11 +10:00
Spigot
825d29f624 Set flushnow to true before writing kicks
By: md_5 <md_5@live.com.au>
2013-05-11 15:37:37 +10:00
Spigot
1a0b9622a2 Reimpliment next-tick-list scale improvements
By: Mike Primm <mike@primmhome.com>
2013-05-05 23:41:11 -05:00
Spigot
53022665c5 Fixed latest patch, thanks snowleo!
By: md_5 <md_5@live.com.au>
2013-05-08 18:57:48 +10:00
Spigot
9e3e6481c9 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.

By: snowleo <schneeleo@gmail.com>
2013-05-08 12:10:34 +10:00
Spigot
36fb322c1e Stage LocalLanguage to mc-dev
By: snowleo <schneeleo@gmail.com>
2013-05-08 12:04:50 +10:00
Spigot
e0881d81c1 *correct patch
By: md_5 <md_5@live.com.au>
2013-05-04 10:29:55 +10:00
Spigot
0faa468caa Don't skip item ticks
By: md_5 <md_5@live.com.au>
2013-05-04 10:14:25 +10:00
Spigot
c60ca2aa0f Let frames be configured for tracking
By: md_5 <md_5@live.com.au>
2013-05-04 10:11:32 +10:00
Spigot
326c461585 Update to latest upstream
By: md_5 <md_5@live.com.au>
2013-05-04 09:24:15 +10:00
Spigot
6baadf891f Add async check we potentially missed
By: md_5 <md_5@live.com.au>
2013-05-01 16:39:55 +10:00
Spigot
1857895f30 [CAUTION] Initial 1.5.2 update - I have NOT had time to TEST. DO NOT use on production server WITHOUT TESTING FIRST.
By: md_5 <md_5@live.com.au>
2013-05-01 08:33:27 +10:00
Spigot
4e51c2090f [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.
By: md_5 <md_5@live.com.au>
2013-04-28 19:52:35 +10:00
Spigot
355abcac1e Increment written bytes value
By: md_5 <md_5@live.com.au>
2013-04-28 08:29:00 +10:00
Spigot
6584a420be [EXPERIMENTAL] Take #3 at an even better / faster buffering system, use at own peril!
By: md_5 <md_5@live.com.au>
2013-04-27 22:13:33 +10:00
Spigot
c816911379 Fixes BUKKIT-3893 - Close world save files when world is
unloaded.

By: Antony Riley <antony@cyberiantiger.org>
2013-04-26 20:35:16 +10:00
Spigot
09d76b3e58 Remove snapshot protocol patch as it will be near impossible to emulate under 1.5
By: md_5 <md_5@live.com.au>
2013-04-26 18:02:57 +10:00
Spigot
7b24fd58d6 Reduce flush time to 10
By: md_5 <md_5@live.com.au>
2013-04-25 10:28:05 +10:00
Spigot
7e252f59bc End login process for filtered IPs
By: md_5 <md_5@live.com.au>
2013-04-25 09:58:55 +10:00
Spigot
f1150c3b83 Remove flush time setter up
By: md_5 <md_5@live.com.au>
2013-04-25 09:55:05 +10:00
Spigot
4041646be6 Use spoofed addresses for events
By: md_5 <md_5@live.com.au>
2013-04-25 09:42:40 +10:00
Spigot
fb25750755 Perfect outbound rate limiter.
By: md_5 <md_5@live.com.au>
2013-04-25 09:33:14 +10:00
Spigot
86c9e69b00 Clean up imports in the Spigot class.
By: md_5 <md_5@live.com.au>
2013-04-25 09:01:05 +10:00
Spigot
ae20c1bdc6 Fix disabled netty again
By: md_5 <md_5@live.com.au>
2013-04-24 21:40:04 +10:00
Spigot
7c326a3a91 Correctly register pending connection when using legacy network handler.
By: md_5 <md_5@live.com.au>
2013-04-23 19:07:40 +10:00
Spigot
24ba405027 Set TCP nodelay to false for Netty
By: md_5 <md_5@live.com.au>
2013-04-23 18:44:49 +10:00
Spigot
6adbf80f04 Add thread naes to their own patch.
By: md_5 <md_5@live.com.au>
2013-04-23 11:50:42 +10:00
Spigot
9ef540adb1 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.
By: md_5 <md_5@live.com.au>
2013-04-23 11:37:51 +10:00
Spigot
cde5a715a3 FIx spacing
By: md_5 <md_5@live.com.au>
2013-04-23 11:35:18 +10:00
Spigot
2a38426e59 Move version resolve check to initial POM patch
By: md_5 <md_5@live.com.au>
2013-04-23 11:32:07 +10:00
Spigot
d4c6c0b527 Move IP filter to own patch and (messily) fix merge conflicts as a result.
By: md_5 <md_5@live.com.au>
2013-04-23 11:27:55 +10:00
Spigot
73650d09a1 Go back to the chunk based count caching for now to avoid mob spawning issues
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-22 03:47:35 +05:00
Spigot
a5e12866f3 Fix world info showing world as always obfuscated
By: md_5 <md_5@live.com.au>
2013-04-21 20:02:08 +10:00
Spigot
61c89efb5c Revert "Readd previous Netty tweaks, the memory leak has been fixed"
This reverts commit 8f58b1d272.

By: md_5 <md_5@live.com.au>
2013-04-21 10:21:35 +10:00
Spigot
8f58b1d272 Readd previous Netty tweaks, the memory leak has been fixed
By: md_5 <md_5@live.com.au>
2013-04-21 08:53:15 +10:00
Spigot
f6de336307 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 bde545c82a.

By: md_5 <md_5@live.com.au>
2013-04-21 08:39:39 +10:00
Spigot
a4744b484b Revert "20 ms works too, anything higher is a bit shifty"
This reverts commit 912c07129b.

By: md_5 <md_5@live.com.au>
2013-04-21 08:39:36 +10:00
Spigot
c95fb0a34a Take the count mapping one step further by removing chunk traversal for count seeking altogether
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-21 00:25:59 +05:00
Spigot
912c07129b 20 ms works too, anything higher is a bit shifty
By: md_5 <md_5@live.com.au>
2013-04-20 19:50:59 +10:00
Spigot
bde545c82a 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.
By: md_5 <md_5@live.com.au>
2013-04-20 19:41:41 +10:00
Spigot
9160931859 Store creature counts to avoid repeated assignable checks and traversal of entity slices
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-20 13:50:09 +05:00
Spigot
adb850995c Java 5/6 compat. NETBEANS!
By: md_5 <md_5@live.com.au>
2013-04-20 17:14:54 +10:00
Spigot
09f1566b74 Oops.
By: md_5 <md_5@live.com.au>
2013-04-19 21:07:42 +10:00
Spigot
acde9aa408 Welcome back snapshot protocol patch! Now 30% more reliable than a leading brand of car cleaner! Testers welcome <3
By: md_5 <md_5@live.com.au>
2013-04-19 19:14:11 +10:00
Spigot
a4b017945b [Experimental] Add connection multiplexer to allow many listen blocks. Secondary listen blocks are configured in bukkit.yml
By: md_5 <md_5@live.com.au>
2013-04-19 17:45:39 +10:00
Spigot
70056940b6 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.

By: SuPaH sPii <r29jk10@gmail.com>
2013-04-18 13:27:29 -05:00
Spigot
b5080a172f Yet another CraftBukkit pulled patch.
By: md_5 <md_5@live.com.au>
2013-04-16 18:36:22 +10:00
Spigot
bca4cb4cf2 Changed minimum characters to 2 for validity check
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-14 21:32:19 +05:00
Spigot
ed656bfa7c Fix first connect mostly failing because it is apparently that big of an issue for some people.
By: md_5 <md_5@live.com.au>
2013-04-14 19:33:56 +10:00
Spigot
be538d0404 Use Pattern
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-04-14 03:25:35 +01:00
Spigot
426b72713f Prevent handshake spam from invalid names.
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-04-14 03:09:29 +01:00
Spigot
2755113f87 Now that thats out the way..
By: md_5 <md_5@live.com.au>
2013-04-13 17:14:56 +10:00
Spigot
4d0077a0cf Re add ping sending patch
By: md_5 <md_5@live.com.au>
2013-04-13 17:11:24 +10:00
Spigot
ece477d0c7 Remove a fair chunk of existing patches now applied to CraftBukkit
By: md_5 <md_5@live.com.au>
2013-04-13 17:06:23 +10:00
Spigot
b4464fc721 Update netty & kindof hacky fix for anvil mishaps
By: md_5 <md_5@live.com.au>
2013-04-12 13:57:00 +10:00
Spigot
d646a97d30 Add @hidendra 's pulls
By: md_5 <md_5@live.com.au>
2013-04-10 17:03:17 +10:00
Spigot
8e28115981 Add written bytes tracking for @bergerkiller
By: md_5 <md_5@live.com.au>
2013-04-10 16:37:43 +10:00
Spigot
a893386a86 Remove stats completely from patches.
By: md_5 <md_5@live.com.au>
2013-04-10 14:08:33 +10:00
Spigot
f5b1669094 Fix patches.
By: md_5 <md_5@live.com.au>
2013-04-10 14:06:41 +10:00
Spigot
b8055fe033 [Cosmetic] Update patches to be generated with latest stable git.
By: md_5 <md_5@live.com.au>
2013-04-10 12:36:11 +10:00
Spigot
fdf667b0d7 Update 0038-Entity-Tracking-Ranges.patch
monsterEntityActivationRange -> monsterTrackingRange
By: Bestle <tom.roberts00@gmail.com>
2013-04-09 02:00:09 +02:00
Spigot
f1e5b66f43 Fixes boat dupe
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-04-05 18:24:55 +01:00
Spigot
4f67a6e4bc Fix oreobfuscator patch
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-04 16:08:00 +05:00
Spigot
ce23b8892d Update for upstream version change
By: Ammar Askar <ammar@ammaraskar.com>
2013-04-04 15:58:51 +05:00
Spigot
5e8546e86a 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.

By: SuPaH sPii <r29jk10@gmail.com>
2013-04-03 17:10:41 -05:00
Spigot
08676f42a0 revert changes to disabled plugins and scheduler.
sorry for messy commit,doing via tablet on ssh
md_5

By: Hudson <hudson@mydomain.com>
2013-04-03 02:20:29 -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
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
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
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
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
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
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
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
Spigot
733952dfef Pull CB PR #1073 by @TheCryoknight - Adds BUKKIT-3821 - Fires vehicle events for saddled pigs
By: TheCryoknight <thecryoknight1@gmail.com>
2013-03-23 10:23:23 +11:00
Spigot
edeefa8529 Fix BUKKIT-3831, don't call vehicle enter events for unloaded chunks
By: me4502 <mnmiller1@hotmail.com>
2013-03-23 10:16:32 +11:00
Spigot
afc740ccf0 Entity Tracking Ranges
By: Aikar <aikar@aikar.co>
2013-03-23 10:12:04 +11:00
Spigot
5fa5beac8e Migrate the crop fixes by @Aikar to the core patch.
By: md_5 <md_5@live.com.au>
2013-03-23 10:08:09 +11:00
Spigot
637ef9d41a Add per world view distance which got lost along the way.
By: md_5 <md_5@live.com.au>
2013-03-23 09:55:21 +11:00
Spigot
af602bf158 [Cleanup] Update merge patches.
By: md_5 <md_5@live.com.au>
2013-03-23 09:48:22 +11:00
Spigot
6920d2c1f8 [Cleanup] Split the long hash changes into their own patch.
By: md_5 <md_5@live.com.au>
2013-03-23 09:31:28 +11:00
Spigot
72dc4ac12e Stage DataWatcher & WatchableObject.
So that we may identify the exact cause of exceptions originating from these classes.

By: md_5 <md_5@live.com.au>
2013-03-21 17:01:03 +11:00
Spigot
f370ab8784 Update to 1.5.1
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-03-20 21:54:12 +00:00
Spigot
bad273fe08 Update le patches so that they may henceforth apply cleanly without errors due to the last upstream commit.
By: md_5 <md_5@live.com.au>
2013-03-19 16:51:45 +11:00
Spigot
082176c726 We should return "" not null for 'corrupt' signs.
By: md_5 <md_5@live.com.au>
2013-03-18 20:33:22 +11:00
Spigot
5ade077442 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

By: md_5 <md_5@live.com.au>
2013-03-18 20:02:03 +11:00
Spigot
cc6e8ab703 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.

By: md_5 <md_5@live.com.au>
2013-03-17 19:02:58 +11:00
Spigot
f4da5482df Deploy server again. wot eva
By: md_5 <md_5@live.com.au>
2013-03-17 12:27:11 +11:00
Spigot
d9002e97ca Update Netty to 4.0.0-Beta3 + reapply patches for new index info.
By: md_5 <md_5@live.com.au>
2013-03-17 09:14:16 +11:00
Spigot
1218987001 Fix isDamaged check for backwards compat
By: md_5 <md_5@live.com.au>
2013-03-16 11:57:39 +11:00
Spigot
5e01ba90c1 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.

By: md_5 <md_5@live.com.au>
2013-03-16 10:17:00 +11:00
Spigot
78b59cb9ef Cleanup patch
By: md_5 <md_5@live.com.au>
2013-03-16 10:11:01 +11:00
Spigot
8cd6af53fe Finish up the patches for 1.5. Now to test.
By: md_5 <md_5@live.com.au>
2013-03-16 09:08:53 +11:00
Spigot
f831bcfce2 Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p
By: md_5 <md_5@live.com.au>
2013-03-16 08:35:56 +11:00
Spigot
16eac56e06 Remove ANSI patch from @jrtc27 for now, breaks log strip colours.
By: md_5 <md_5@live.com.au>
2013-03-15 20:49:12 +11:00
Spigot
3c598b3871 Strip colours from logs when enabled.
By: md_5 <md_5@live.com.au>
2013-03-15 20:46:16 +11:00
Spigot
63ba9e08e4 Fix stripping colours in console logs.
By: md_5 <md_5@live.com.au>
2013-03-14 19:15:38 +11:00
Spigot
39f0cb433f Rename ambiguous methods.
By: md_5 <md_5@live.com.au>
2013-03-14 16:32:15 +11:00
Spigot
d21bdd7de7 Reapply Container.java CraftBukkit patches, but with 1.5 logic. This fixes crafting and other issues.
By: md_5 <md_5@live.com.au>
2013-03-14 16:25:03 +11:00
Spigot
371c0e343c Restart even if restart script is not found
By: Runemoro <runemoro@live.ca>
2013-03-13 18:28:49 +11:00
Spigot
8c7c0995db Undo all that encryption faff - NioBuffers arent for the job.
By: md_5 <md_5@live.com.au>
2013-03-12 17:26:16 +11:00
Spigot
7a4245e726 Another shot at encryption - thanks to all those testers, getting this right is important for BungeeCord!
By: md_5 <md_5@live.com.au>
2013-03-12 07:29:16 +11:00
Spigot
0947af2b10 Take #12312 at faster encryption - a brave soul who doesnt mind a minute or 2 of downtime should try
By: md_5 <md_5@live.com.au>
2013-03-11 20:30:38 +11:00
Spigot
70186151ea Fix patch name.
By: md_5 <md_5@live.com.au>
2013-03-11 20:08:41 +11:00
Spigot
50660d1b41 Update snapshot version.
By: md_5 <md_5@live.com.au>
2013-03-11 19:14:10 +11:00
Spigot
68f9541e46 Revert "Use blazingly fast encryption."
This reverts commit 3309234e39.

By: md_5 <md_5@live.com.au>
2013-03-11 18:45:25 +11:00
Spigot
3309234e39 Use blazingly fast encryption.
By: md_5 <md_5@live.com.au>
2013-03-11 09:53:34 +11:00
Spigot
02150db731 Thread safety.
Adds thread safety for chunk load / unload methods.

By: md_5 <md_5@live.com.au>
2013-03-07 20:12:53 +11:00
Spigot
89f57511ac Rename generated repo, and only deploy API, not server.
By: md_5 <md_5@live.com.au>
2013-03-07 17:45:12 +11:00
Spigot
e514a12e83 Quick fix damage event
By: md-5 <md_5@live.com.au>
2013-03-05 07:22:03 +11:00
Spigot
cbbd6b577d 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.
By: md_5 <md_5@live.com.au>
2013-03-04 18:49:59 +11:00
Spigot
ce69ac9dbe Fix errors in command block commands crashing the server.
By: md_5 <md_5@live.com.au>
2013-03-03 20:23:04 +11:00
Spigot
35e8706397 CB has now merged the commits we pulled, so they can be removed.
By: md_5 <md_5@live.com.au>
2013-03-03 09:37:31 +11:00
Spigot
0f2cfe0303 Fix snapshot support.
By: md_5 <md_5@live.com.au>
2013-03-02 17:27:44 +11:00
Spigot
4013812866 Add configurable 13w09c protocol support.
By: md_5 <md_5@live.com.au>
2013-03-02 13:34:52 +11:00
Spigot
23ef44c195 Rename connection timing to accurately reflect what is actually being timed.
By: md_5 <md_5@live.com.au>
2013-03-02 10:40:13 +11:00
Spigot
533f36d39b Pull CraftBukkit #1007 from @jrtc27 - console formatting now replicates Minecraft properly.
By: md_5 <md_5@live.com.au>
2013-03-02 10:07:29 +11:00
Spigot
00c98bb061 Pull CraftBukkit #1043 by @YLivay - addresses incorrect info returned to plugins in the dispense event.
By: md_5 <md_5@live.com.au>
2013-03-02 09:47:17 +11:00
Spigot
4812d94ad9 Pull CraftBukkit #1042 by @YLivay - addresses players glitching when the sleep whilst being marked as faux sleepers.
By: md_5 <md_5@live.com.au>
2013-03-02 09:43:59 +11:00
Spigot
abb5a8c429 Pull CraftBukkit #1041 by @YLivay - address missing event for paintings breaking due to movement.
By: md_5 <md_5@live.com.au>
2013-03-02 09:38:27 +11:00
Spigot
93b6957b56 Pull CraftBukkit PR #1037 by @EdGruberman - fixes issues with plugins and items dropped by clicking outside an inventory.
By: md_5 <md_5@live.com.au>
2013-03-02 09:25:48 +11:00
Spigot
166d4a8990 Pull CraftBukkit #1028 by @EdGruberman to address a few issues with plugins and beds.
By: md_5 <md_5@live.com.au>
2013-03-02 09:17:52 +11:00
Spigot
c7f16ebbea When I add code to prevent server crashes, I expect it to stay there.
By: md_5 <md_5@live.com.au>
2013-03-02 09:09:10 +11:00
Spigot
6d3ec813ed Pull CraftBukkit #1024 by @evilmidget38 - Correct the CB object used for Brewing Stands. Fixes BUKKIT-3357
By: md_5 <md_5@live.com.au>
2013-03-02 09:05:30 +11:00
Spigot
5bf4cae8ba Sanity check for naughty plugins
Naughty plugins like DisguiseCraft hook into NMS and create entities with a null world.
So ensuring world is set or else defaulting to false

By: Aikar <aikar@aikar.co>
2013-02-27 10:10:07 -05:00
Spigot
dfe217aca6 Optimize checkIfActive to only check if chunks are loaded if entity is active
This will cut down on the call to areChunksLoaded drastically, which is pretty slow

By: Aikar <aikar@aikar.co>
2013-02-27 02:27:14 -05:00
Spigot
2c8cc83ee8 *crosses fingers for sneaky web edit
By: md-5 <md_5@live.com.au>
2013-02-27 17:14:37 +11:00
Spigot
78edae0084 Bump netty version. Why they so no pull my PR yet?
By: md_5 <md_5@live.com.au>
2013-02-27 16:51:57 +11:00
Spigot
fb5f7ea45a Netty has to be done with -D options to the JVM. Sorry!
By: md_5 <md_5@live.com.au>
2013-02-27 16:48:20 +11:00
Spigot
129f77dc51 Do not include task id in timings handler name
Plugins that spam use repeating task timers are filling up the CustomTimingHandler list, which can degrade performance over time
Considering Essentials does this, and many servers use Essentials... def need to stop this.

By: Aikar <aikar@aikar.co>
2013-02-27 00:39:53 -05:00
Spigot
fd69c72b22 Increase default watchdog time
By: md_5 <md_5@live.com.au>
2013-02-27 12:04:04 +11:00
Spigot
3be016271f Overhaul to Timings and Entity Activation Range
This greatly extends the timings improvements I've done in recent commits, and brings timings to fully cover the entire tick.
The timings system also now tracks when specific timings causes the server to lose TPS.
The timings are also able to be turned on "on demand", meaning you do not need to restart the server to enable them.

This commit also overhauls the Entity Activation Range feature, fixing bugs, adding more immunities, and improving the performance of it.
It also fixes a regression with a recent Spigot commit that broke the entire Entity Activation Range feature.

This commit had to move the Tick Loop patch before timings because there was a change done there to time the entire tick, so lots of renames.

These 2 commits had to be bundled together to simplify applying them and reduce redundant conflict resolution.

By: Aikar <aikar@aikar.co>
2013-02-26 12:21:40 -05:00
Spigot
7c1adc0df4 Fix ores from bouncing off walls
By: SuPaH sPii <r29jk10@gmail.com>
2013-02-26 11:43:00 +11:00
Spigot
15d29c806a Allow small view distances.
By: md_5 <md_5@live.com.au>
2013-02-26 11:31:37 +11:00
Spigot
dbfd5fc5b0 Add missing config options.
By: md_5 <md_5@live.com.au>
2013-02-26 11:19:08 +11:00
Spigot
c3f23f2bef Add PR #7 - improve ping sending.
By: md_5 <md_5@live.com.au>
2013-02-24 20:43:10 +11:00
Spigot
dc2708293f Pull CraftBukkit PR 1021 - Prevent exploitation of custom plugin channels
By: md_5 <md_5@live.com.au>
2013-02-24 17:28:42 +11:00
Spigot
19823834ea Fix metrics, I hope.
By: md_5 <md_5@live.com.au>
2013-02-24 13:51:58 +11:00
Spigot
006da500e9 Try new way of handling maps in frames
By: Aikar <aikar@aikar.co>
2013-02-24 13:37:20 +11:00
Spigot
3c7dbb66cd Use native Java ciphers in favour of BouncyCastle. Cookie to whoever can try and use the native byte buffer backing the Netty buffers for encryption / decryption.
By: md_5 <md_5@live.com.au>
2013-02-24 12:38:41 +11:00
Spigot
567a45621c Fix NPE on start
By: md_5 <md_5@live.com.au>
2013-02-24 12:19:34 +11:00
Spigot
54b9e5d4f8 Tweaks + extra config concerning the network subsystem
By: md_5 <md_5@live.com.au>
2013-02-24 12:01:33 +11:00
Spigot
1367d5dc69 Pop Netty patch to the top.
By: md_5 <md_5@live.com.au>
2013-02-24 11:31:54 +11:00
Spigot
fd322f7c1b Make restart more reliable
By: Keir Nellyer <keir@nellyer.co.uk>
2013-02-24 11:30:30 +11:00
Spigot
5f0ca4e289 [[Experimental]] Rewrite Watchdog thread / crash detector.
By: md_5 <md_5@live.com.au>
2013-02-23 12:37:58 +11:00
Spigot
013c121a6f Prepare for restart / crash detection rewrite.
By: md_5 <md_5@live.com.au>
2013-02-23 11:50:29 +11:00
Spigot
2e26d4a2bf Start metrics only once
By: md_5 <md_5@live.com.au>
2013-02-23 09:59:26 +11:00
Spigot
bcb0ea56d4 Rerwrite the metrics code to be closer to the Bukkit version.
By: md_5 <md_5@live.com.au>
2013-02-23 08:58:55 +11:00
Spigot
1682097f81 Remove TagAPI patches.
By: md_5 <md_5@live.com.au>
2013-02-22 19:30:23 +11:00
Spigot
22048bfe81 Add highPriorityQueue
By: md_5 <md_5@live.com.au>
2013-02-22 19:29:36 +11:00
Spigot
14a8719dad Allow provisionally disabling chunk GC
By: md_5 <md_5@live.com.au>
2013-02-22 19:11:59 +11:00
Spigot
67374a6263 Improved tile entity lookup for chunk sending
We already have direct access to the chunks tile entities, there is no reason to look them up again.

By: shakytom <tom.roberts00@gmail.com>
2013-02-20 23:16:49 -05:00
Spigot
c3fc9635b8 Optimize getTileEntities
Avoid traversing tile entities for every loaded chunk

By: Mike Primm <mike@primmhome.com>
2013-02-21 00:40:28 -06:00
Spigot
56f1d1c01d TagAPI won't load anyway - no need to manually disable it.
By: md_5 <md_5@live.com.au>
2013-02-20 20:20:27 +11:00
Spigot
ce038722f8 Implement the rest of TagAPI
By: md_5 <md_5@live.com.au>
2013-02-20 19:08:43 +11:00
Spigot
ba3f658dfd Fix falling sand entities with orebfuscator.
By: SuPaH sPii <r29jk10@gmail.com>
2013-02-19 18:58:31 -06:00
Spigot
23fc65c6fd This is what I call the balancing game - use 2 NIO threads
By: md_5 <md_5@live.com.au>
2013-02-20 07:34:18 +11:00
Spigot
587fe30827 Remove extra chunkGC call left over after CraftBukkit merge
By: Aikar <aikar@aikar.co>
2013-02-19 15:10:01 -05:00
Spigot
061fdf3d06 Fix logic error with living entity collision reduction.
The previous version missed the entire point of the change and made it only skip collision on NON living entities... which is not often at all.

It was meant to only Skip Living->Living, or else we won't get any gain...

By: Aikar <aikar@aikar.co>
2013-02-19 11:43:00 -05:00
Spigot
65d005a475 Name that thread too
By: md_5 <md_5@live.com.au>
2013-02-19 20:30:26 +11:00
Spigot
71175ecaa8 Dont disable tagAPI for now
By: md_5 <md_5@live.com.au>
2013-02-19 20:28:30 +11:00
Spigot
ba015768c7 Few fixes, tweaks for Netty
By: md_5 <md_5@live.com.au>
2013-02-19 19:38:18 +11:00
Spigot
b32484c70f Implement TagAPI into Spigot - much more efficient and only a dozen lines of code.
By: md_5 <md_5@live.com.au>
2013-02-19 18:30:34 +11:00
Spigot
5451e30739 Change field name for backwards support
By: md_5 <md_5@live.com.au>
2013-02-19 18:01:42 +11:00
Spigot
1c86622253 Oops
By: md_5 <md_5@live.com.au>
2013-02-18 18:30:25 +11:00
Spigot
2f74e8d74d Bit nicer for TagAPI
By: md_5 <md_5@live.com.au>
2013-02-18 17:46:31 +11:00
Spigot
75510381f7 Move protocol lib threads around - and reduce netty threads a lot.
By: md_5 <md_5@live.com.au>
2013-02-17 20:47:27 +11:00
Spigot
fd8ab30ef6 Update to actually compile with netty beta
By: md_5 <md_5@live.com.au>
2013-02-17 20:15:48 +11:00
Spigot
aaf58e51fe Use correct depend
By: md_5 <md_5@live.com.au>
2013-02-17 20:10:50 +11:00
Spigot
00a55293f5 Use release Netty to avoid performance regressions.
By: md_5 <md_5@live.com.au>
2013-02-17 20:06:57 +11:00
Spigot
ffd8c932ba Handle vanished players in tab list
By: md_5 <md_5@live.com.au>
2013-02-17 17:31:52 +11:00
Spigot
59f79fb46a Use more threads for netty to help with lag.
By: md_5 <md_5@live.com.au>
2013-02-17 16:35:11 +11:00
Spigot
594eb1651c Use tab list name to prevent duplicates.
By: md_5 <md_5@live.com.au>
2013-02-16 19:46:56 +11:00
Spigot
bca3cabb22 Keep a definsive copy of players for entity activation
By: md_5 <md_5@live.com.au>
2013-02-16 19:46:08 +11:00
Spigot
7da770870f Use vanilla method - just with toggle
By: md_5 <md_5@live.com.au>
2013-02-16 19:05:26 +11:00
Spigot
c363ace8a7 Allow to occasionally send tab list updates
By: md_5 <md_5@live.com.au>
2013-02-16 17:56:39 +11:00
Spigot
d815af0ec3 Use a compression level of 4 for chunk packets
By: md_5 <md_5@live.com.au>
2013-02-16 13:33:46 +11:00
Spigot
8fd703d6bb And chests...
By: md_5 <md_5@live.com.au>
2013-02-16 10:24:25 +11:00
Spigot
c69472dab1 Don't use ender chests or stone as hiding materials
By: md_5 <md_5@live.com.au>
2013-02-16 10:19:31 +11:00
Spigot
7d84569b06 Add engine mode 2
By: SuPaH sPii <r29jk10@gmail.com>
2013-02-16 10:13:00 +11:00
Spigot
dd60921594 Make map send speed configurable.
By: md_5 <md_5@live.com.au>
2013-02-15 18:34:42 +11:00
Spigot
25a0b1356d Please don't spam console every ping.
By: md_5 <md_5@live.com.au>
2013-02-15 18:25:53 +11:00