Commit Graph

309 Commits

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