CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
487 Commits 1 Branch 0 Tags 4.9 MiB
f6ecb2c9fa
Commit Graph

323 Commits

Author SHA1 Message Date
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
md_5
08fef878fa Pull CraftBukkit #1041 by @YLivay - address missing event for paintings breaking due to movement. 2013-03-02 09:38:27 +11:00
md_5
c454326dbf Pull CraftBukkit PR #1037 by @EdGruberman - fixes issues with plugins and items dropped by clicking outside an inventory. 2013-03-02 09:25:48 +11:00
md_5
287b636b66 Pull CraftBukkit #1028 by @EdGruberman to address a few issues with plugins and beds. 2013-03-02 09:17:52 +11:00
md_5
1c84a5dd8c When I add code to prevent server crashes, I expect it to stay there. 2013-03-02 09:09:10 +11:00
md_5
e2ca1b4c97 Pull CraftBukkit #1024 by @evilmidget38 - Correct the CB object used for Brewing Stands. Fixes BUKKIT-3357 2013-03-02 09:05:30 +11:00
Aikar
4a97306f92 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
 2013-02-27 10:10:07 -05:00
Aikar
577140d9ab 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
 2013-02-27 19:10:22 +11:00
md-5
adc47e13e1 *crosses fingers for sneaky web edit 2013-02-27 17:14:37 +11:00
md_5
d191b1171b Bump netty version. Why they so no pull my PR yet? 2013-02-27 16:51:57 +11:00
md_5
e8de702f14 Netty has to be done with -D options to the JVM. Sorry! 2013-02-27 16:48:20 +11:00
Aikar
b5230a3857 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.
 2013-02-27 16:43:21 +11:00
md_5
44927fdaa6 Increase default watchdog time 2013-02-27 12:04:04 +11:00
Aikar
e9950b70d3 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.
 2013-02-27 07:29:33 +11:00
SuPaH sPii
952580285d Fix ores from bouncing off walls 2013-02-26 11:43:00 +11:00
md_5
b5b668aae7 Allow small view distances. 2013-02-26 11:31:37 +11:00
md_5
035204aad2 Add missing config options. 2013-02-26 11:19:08 +11:00
md_5
d852f744a0 Add PR #7 - improve ping sending. 2013-02-24 20:47:26 +11:00
md_5
7bba9c7354 Pull CraftBukkit PR 1021 - Prevent exploitation of custom plugin channels 2013-02-24 17:28:42 +11:00
md_5
a179158f34 Fix metrics, I hope. 2013-02-24 13:57:54 +11:00
Aikar
8237774639 Try new way of handling maps in frames 2013-02-24 13:37:20 +11:00
md_5
1bd64e3e7a 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. 2013-02-24 12:38:41 +11:00
md_5
d95c162605 Fix NPE on start 2013-02-24 12:19:34 +11:00
md_5
7baf714b5d Tweaks + extra config concerning the network subsystem 2013-02-24 12:01:33 +11:00
md_5
0c82f07a42 Pop Netty patch to the top. 2013-02-24 11:31:54 +11:00
Keir Nellyer
9d8bd67e07 Make restart more reliable 2013-02-24 11:30:30 +11:00
md_5
f7687b0c20 [[Experimental]] Rewrite Watchdog thread / crash detector. 2013-02-24 11:25:38 +11:00
md_5
421ce6cf7d Prepare for restart / crash detection rewrite. 2013-02-24 11:25:01 +11:00
md_5
6e73bed17b Start metrics only once 2013-02-23 09:59:26 +11:00
md_5
aa42a15d01 Rerwrite the metrics code to be closer to the Bukkit version. 2013-02-23 08:58:55 +11:00
md_5
125729df15 Remove TagAPI patches. 2013-02-22 19:30:23 +11:00
md_5
d08be2dbc9 Add highPriorityQueue 2013-02-22 19:29:36 +11:00
md_5
bca23f750e Allow provisionally disabling chunk GC 2013-02-22 19:11:59 +11:00
shakytom
274a38539d 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.
 2013-02-21 00:40:48 -06:00
Mike Primm
afba75b6cb Optimize getTileEntities 
Avoid traversing tile entities for every loaded chunk
 2013-02-21 00:40:28 -06:00
md_5
f64b42a456 TagAPI won't load anyway - no need to manually disable it. 2013-02-20 20:20:27 +11:00
md_5
069706b11b Implement the rest of TagAPI 2013-02-20 19:08:43 +11:00
SuPaH sPii
52dc8edc39 Fix falling sand entities with orebfuscator. 2013-02-20 12:04:22 +11:00
md_5
55f1b26ae2 This is what I call the balancing game - use 2 NIO threads 2013-02-20 07:34:18 +11:00
Aikar
d1070f3cdb Remove extra chunkGC call left over after CraftBukkit merge 2013-02-20 07:29:18 +11:00
Aikar
8fa6448620 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...
 2013-02-20 07:28:58 +11:00
md_5
3f62bda4a9 Name that thread too 2013-02-19 20:30:26 +11:00
md_5
1dd5a318d7 Dont disable tagAPI for now 2013-02-19 20:28:30 +11:00
md_5
ad40d85a05 Few fixes, tweaks for Netty 2013-02-19 19:38:18 +11:00
md_5
a89be1da7d Implement TagAPI into Spigot - much more efficient and only a dozen lines of code. 2013-02-19 18:30:34 +11:00
md_5
fe20a581bc Change field name for backwards support 2013-02-19 18:01:42 +11:00
md_5
1b070c62c6 Oops 2013-02-18 18:30:25 +11:00
md_5
d948300c35 Bit nicer for TagAPI 2013-02-18 17:46:31 +11:00
md_5
6546568a17 Move protocol lib threads around - and reduce netty threads a lot. 2013-02-17 20:47:27 +11:00
md_5
fb324452c2 Update to actually compile with netty beta 2013-02-17 20:15:48 +11:00
md_5
b92c8190a2 Use correct depend 2013-02-17 20:10:50 +11:00
md_5
7ae39f39cb Use release Netty to avoid performance regressions. 2013-02-17 20:06:57 +11:00
md_5
4f6246addd Handle vanished players in tab list 2013-02-17 17:31:52 +11:00
md_5
57e025bb17 Use more threads for netty to help with lag. 2013-02-17 16:35:11 +11:00
md_5
e942bf6641 Use tab list name to prevent duplicates. 2013-02-16 19:46:56 +11:00
md_5
c83471b860 Keep a definsive copy of players for entity activation 2013-02-16 19:46:08 +11:00
md_5
60b7ce9918 Use vanilla method - just with toggle 2013-02-16 19:05:26 +11:00
md_5
ecf56eb38f Allow to occasionally send tab list updates 2013-02-16 17:56:39 +11:00
md_5
d9639eb91d Use a compression level of 4 for chunk packets 2013-02-16 13:33:46 +11:00
md_5
1999f357bc And chests... 2013-02-16 10:24:25 +11:00
md_5
c79ce8ec88 Don't use ender chests or stone as hiding materials 2013-02-16 10:19:31 +11:00
SuPaH sPii
41c3037566 Add engine mode 2 2013-02-16 10:13:00 +11:00
md_5
5bfd44a991 Make map send speed configurable. 2013-02-15 18:34:42 +11:00
md_5
5e025e3b9f Please don't spam console every ping. 2013-02-15 18:25:53 +11:00
md_5
44e5fd627f Remove extra disconnect info - confuses people into thinking something is wrong 2013-02-14 17:33:09 +11:00