13
0
geforkt von Mirrors/Paper
Commit graph

292 Commits

Autor SHA1 Nachricht Datum
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