Commit graph

232 commits

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