Commit graph

1140 commits

Author SHA1 Message Date
Thinkofdeath
98e006c856 Fix a deadlock that could happen in offline mode when shutting down the server 2015-04-20 09:49:39 +01:00
md_5
19d9d39eac Use CLQ for main thread tasks.
Means netty threads aren't blocked for long synchronisations whilst tasks are running.
2015-04-19 20:20:50 +10:00
Thinkofdeath
911a5d776b Upstream merge 2015-04-16 22:34:44 +01:00
Thinkofdeath
9f979ee4bf Improve NBTReadLimiter 2015-04-16 17:38:35 +01:00
Thinkofdeath
7230cfe24d Upstream merge 2015-04-16 11:19:45 +01:00
md_5
548dca016c Rebuild #3 2015-04-09 13:45:13 +10:00
md_5
e5af9ac1b5 Rebuild #2 2015-04-09 13:39:59 +10:00
md_5
e249de236b Hash rebuild 2015-04-09 13:18:56 +10:00
md_5
a0a29a2911 SPIGOT-750: Barrier blocks are transparent for xray purposes 2015-04-09 10:23:32 +10:00
Thinkofdeath
b540d108ac Patch rebuild 2015-04-05 16:09:21 +01:00
Thinkofdeath
3e84fd4c31 Upstream merge 2015-03-24 20:45:15 +00:00
Thinkofdeath
3ce8cf1a9a Upstream merge 2015-03-22 19:50:13 +00:00
Thinkofdeath
e3c9d51e96 Upstream merge 2015-03-19 21:31:59 +00:00
Thinkofdeath
1465f017f2 Upstream merge 2015-03-17 21:22:17 +00:00
Thinkofdeath
dbbf5810b9 Upstream merge 2015-03-16 19:47:37 +00:00
Thinkofdeath
3c15908aac Upstream merge 2015-03-16 10:19:21 +00:00
Thinkofdeath
d96ecbc04b Add missing mc-dev import 2015-03-15 22:18:05 +00:00
Thinkofdeath
68c9a6e117 SPIGOT-709: Extend the block place limit to arm swings 2015-03-15 22:09:27 +00:00
Thinkofdeath
98750ee399 Upstream merge 2015-03-15 21:45:15 +00:00
md_5
53f7eede16 SPIGOT-660 remove unrequired patch. 2015-03-13 18:12:06 +11:00
Thinkofdeath
a630a9f1db Patch rebuild 2015-03-11 10:19:32 +00:00
Thinkofdeath
64cd5dcd0c Disable hopper check configuring, breaks various hopper machines 2015-03-08 12:42:50 +00:00
Thinkofdeath
809120c67f Rebuild patches 2015-03-08 11:04:41 +00:00
Thinkofdeath
fc2a701b92 Fix null pointer issue with async skull converting 2015-03-07 15:48:05 +00:00
Thinkofdeath
a93c6f2875 Fix the player's uuid being null in Bungee mode/offline mode 2015-03-07 13:34:07 +00:00
Thinkofdeath
c0638b6ffb Update to Minecraft 1.8.3 2015-02-28 11:36:22 +00:00
Johannes Donath
b77ae4c941 Fixed problems with World.getPlayers() 2015-02-27 21:14:00 +01:00
md_5
5c0c3d346e Patch rebuild. 2015-02-26 21:40:16 +11:00
Thinkofdeath
390839a207 Fix a possible edge case with the ticking changes by delaying removal until next tick 2015-02-22 11:08:39 +00:00
md_5
52541311d4 Use FastMatches for ItemStack Dirty Check
The check to find dirty itemstacks and send update packets each tick can be very intensive as it checks the entire itemstack, including the entire NBT map. To save on this, 19/20 times we will simply compare the basic count/data/type. If for some strange reason the NBT of an item already existing in an inventory is changes, it will take up to 1 second to show, with an average time of half a second. This odd 0.5 second delay is far preferable to lag every tick, and shouldn't be noticed by anyone.
2015-02-22 12:27:58 +11:00
md_5
13b5b39d41 Allow Capping (Tile)Entity Tick Time.
This patch adds world configuration options for max-tick-time.entity / max-tick-time.tile which allows setting a hard cap on the amount of time (in milliseconds) that a tick can consume. The default values of 50ms each are very conservative and mean this feature will not activate until the server is well below 15tps (minimum). Values of 20ms each have been reported to provide a good performance increase, however I personally think 25ms for entities and 10-15ms for tiles would give even more significant gains, assuming that these things are not a large priority on your server.

For tiles there is very little tradeoff for this option, as tile ticks are based on wall time for most things, however for entities setting this option too low could lead to jerkiness / lag. The gain however is a faster and more responsive server to other actions such as blocks, chat, combat etc.

This feature was commisioned by Chunkr.
2015-02-22 12:02:19 +11:00
Thinkofdeath
933975a2f7 SPIGOT-593: Fix a mistake with the EntitySlice patch 2015-02-20 16:39:04 +00:00
md_5
95c8338f5b Fix compile of activation range, oops 2015-02-20 21:38:01 +11:00
md_5
81e2f78f91 Use Standard List for EntitySlices. 2015-02-20 21:34:11 +11:00
Thinkofdeath
f80c13d801 Upstream merge 2015-02-18 10:24:40 +00:00
md_5
a44f5dd1b5 More conflict resolution. 2015-02-15 12:55:54 +11:00
md_5
06faae935f Fix merge conflicts. 2015-02-15 12:52:33 +11:00
Thinkofdeath
00c4207874 Fix entity activation range for fireworks and items 2015-02-13 21:51:02 +00:00
Thinkofdeath
0e2ad96a6c Upstream merge 2015-02-12 14:25:18 +00:00
Thinkofdeath
954c898c28 SPIGOT-522: Remove the global api cache option
This was useful when plugins first started upgrading to uuid because each
plugin would implement their own way for grabbing uuid's from mojang. Because
none of them shared the result they would quickly hit the limits on the api
causing the conversion to either fail or pause for long periods of time. The
global api cache was a (very hacky) way to force all plugins to share a cache
but caused a few issues with plugins that expected a full implementation of
the HTTPURLConnection. Due to the fact that most servers/plugins have updated
now it seems to be a good time to remove this as its usefulness mostly has
expired.
2015-02-06 10:08:31 +00:00
Thinkofdeath
6f8cdbf0f4 Fix the 'Remove uneeded validation' patch
Looks like it may have been broken during the 1.8 update (or it was always
broken)
2015-01-30 09:36:43 +00:00
Thinkofdeath
ea2b36a864 Fix merge conflicts 2015-01-25 14:44:52 +00:00
Thinkofdeath
553a96920a SPIGOT-459: Update the structure saving warning 2015-01-25 14:35:55 +00:00
md_5
0affb6adab Fix merge conflicts. 2015-01-25 10:37:00 +11:00
Thinkofdeath
0140e85cc0 Me and windows are not getting along 2015-01-18 18:28:49 +00:00
Thinkofdeath
1b8477d2fe Whoops 2015-01-18 18:23:17 +00:00
Thinkofdeath
2dbd93ee7f Upstream merge 2015-01-18 18:17:11 +00:00
md_5
020079df9a Merge 2015-01-17 10:12:14 +11:00
Thinkofdeath
65c90b951a SPIGOT-326: Fix an overflow issue which caused particles to only show in a 1 block radius 2015-01-16 23:08:37 +00:00
md_5
001a3a2e20 Merge in changes. 2015-01-16 14:58:23 +11:00
md_5
c94114c455 Allow sun JVM classes for Spigot 2015-01-12 20:14:12 +11:00
md_5
7d24bbe67d Upstream merge. 2015-01-12 20:08:41 +11:00
md_5
4988864512 SPIGOT-401: Add async catcher for mob effects. 2015-01-12 11:38:47 +11:00
md_5
9c2215ee02 Fix patches 2015-01-09 11:14:57 +11:00
md_5
f2bf62789d Upstream merge. 2015-01-05 14:32:01 +11:00
Zach Brown
1e81634a9d Update from upstream SpigotMC
eb39b4729ce
59b08be5833
a723278f74a
2015-01-04 20:01:24 -06:00
Zach Brown
105e5e9ba4 Update from upstream SpigotMC take 2: Update harder 2014-12-27 16:07:04 -06:00
Zach Brown
4832a37296 Update from upstream SpigotMC
f234263c871
9f2d587b97e
6d85d979798
24ca434ad3c
5ffe41c3910
13716d9d5ee
2014-12-27 15:39:37 -06:00
Zach Brown
a9b3e95f53 Update from upstream SpigotMC
3beb7729816
a77ed5758a7
52c130fc6d9
2014-12-20 19:09:49 -06:00
Zach Brown
afa737e5a5 Update from upstream SpigotMC
a3168ab2ce4
9b45d9fa8d3
b43a31a5c25
a926b96d5d1
d6b5ba7ca03
bb782d07aed
5a74d55c678
47b1dff3e68 [M]
2014-12-18 17:33:08 -06:00
Zach Brown
de978d5161 Update from upstream SpigotMC
3e3ea0bd0d8
320ed92779f
612de468951
2014-12-14 15:54:10 -06:00
Zach Brown
6e2bd0745f Update from upstream SpigotMC
81e4ab71ca4
b023457499d
dc776bee32b
116e6fc98dc
2b97a3846f2
2014-12-12 22:47:57 -06:00
Zach Brown
af1661e8d3 Update from upstream SpigotMC
44608631338 [M]
29dbaa783fe
edf691c2e93
da9bbdfaea9
330d66bfb62
2014-12-10 22:21:51 -06:00
Zach Brown
56ceecc674 Update from upstream SpigotMC
c5492f80081
d5bf8668b99
a93b19a04cd
2014-12-09 19:58:37 -06:00
Zach Brown
657e0890dc Update from upstream SpigotMC
6669d6ecd2b
b2740df50bb
bf71dc61149
fba27a2ea80
92ee7e7f8ec
b28f0d3de23
4beb4ac3918
0ddb6f3dde8
afe301fe892
b8f6402bbbe
2014-12-07 13:26:30 -06:00
Zach Brown
d6ca2dd326 Update from upstream SpigotMC
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
2014-12-05 21:33:40 -06:00
Zach Brown
110b463d27 Merge with Spigot
da32fe1d549 <- Increase max scoreboard objective size
2014-12-03 18:13:06 -06:00
Zach Brown
2bb64147b6 Update from upstream SpigotMC
66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
2014-12-02 00:02:15 -06:00
Zach Brown
386df52297 Update SpigotMC's patches
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK
e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge
d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch
068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
2014-11-30 16:16:48 -06:00
Zach Brown
d2c503e68a Update Spigot's Patches round 2?
The hell happened here.
:
Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf

This new system breaks a lot :(
2014-11-28 18:06:26 -06:00
Zach Brown
a52eb21fd8 Update PaperSpigot to Minecraft 1.8 2014-11-27 17:17:45 -08:00
Zach Brown
0dc6acba77 Add Spigot binary patch 20141113a 2014-11-13 20:46:01 -06:00
Byteflux
f9fa108a49 Update with more Spigot binary patches 2014-10-02 16:54:57 -05:00
Byteflux
64acfb63bc Update with latest patches from upstream SpigotMC 2014-09-21 22:05:59 -05:00
Zach Brown
63172e4468 Update 1.8-proto from upstream SpigotMC
Default to integer instead of hearts to match 1.7 behavior SpigotMC/Spigot@dd5ae56242
Add a tab header / footer packet for use by plugins SpigotMC/Spigot@16a1f257e8
Fix an error with particle handling and add the new 'mobappearance' p... SpigotMC/Spigot@39fdf43ae7
Use correct length when converting maps to 1.8 wire format SpigotMC/Spigot@416bbd0a32
Add title packet for use by plugins SpigotMC/Spigot@a1570f68e5
2014-09-03 21:22:34 -05:00
Zach Brown
8afe9168c7 Update 1.8-proto from upstream SpigotMC
Fix ProtocolLib compatibility. SpigotMC/Spigot@710eb7514b
Bump protocol to 1.8 SpigotMC/Spigot@dd01fbe415
Merge the Protocollib fix into the snapshot branch SpigotMC/Spigot@8ff46693f6
Correctly send the MC|Brand packet SpigotMC/Spigot@0e0982d98c
Block EchoPet as it causes client crashes with the 1.8 patch SpigotMC/Spigot@480804b38f
Replace invalid items for 1.8 clients with (kinda) sane replacements SpigotMC/Spigot@892c121ff1
Fix the furnace progress bars for 1.8 clients SpigotMC/Spigot@a799b4d5ea
2014-09-02 15:37:06 -05:00
Zach Brown
b7e702dacc Update from upstream SpigotMC
Fix double plants having the incorrect top half SpigotMC/Spigot@377b69d787
Fix boats thinking that they were always on land for 1.8 clients SpigotMC/Spigot@4a083f819e
Correct the action used in updateGamemode. this isn't used by the ser... SpigotMC/Spigot@face904a9a
Allow the updated version of protocollib to be enabled SpigotMC/Spigot@4614a615cc
2014-09-01 18:54:34 -05:00
Zach Brown
a0e810eaf9 Rebase (Update) from upstream SpigotMC
Don't send requests of every player was found in the global api cache SpigotMC/Spigot@841270ff1e
Correctly set the response code for the cached lookups and return the ... SpigotMC/Spigot@f170b7899c
Don't try and re-set the global api cache on reload SpigotMC/Spigot@b410a00a66
Use a compile time sneaky throw hack. SpigotMC/Spigot@508462b96b
Fix a missed rename in WorldGenGroundBush SpigotMC/Spigot@0614d8fae9
2014-08-31 13:56:05 -05:00
Zach Brown
b68cbfc54d Add Spigot's 1.8 protocol patch - Update from upstream
Add support for Minecraft 1.8.x SpigotMC/Spigot@b15ae91145
Skip loading of ProtocolLib SpigotMC/Spigot@508ec8f573
Apply the block fix to block change packets SpigotMC/Spigot@b9349e416d
Blacklist Orebfuscator as well. SpigotMC/Spigot@b2ba105762
2014-09-01 14:11:02 -05:00
Zach Brown
3327198680 Update from upstream SpigotMC
Add unbreakable API to item meta SpigotMC/Spigot@b1af008222
Configure how often EntityHangings calculate if they should die. SpigotMC/Spigot@ac6e1fc32d
Copy ItemStacks in DataWatcher to prevent ConcurrentModificationExcep… SpigotMC/Spigot@2af28ffbd1
Add the spigot.yml into the timings paste SpigotMC/Spigot@d61f38bd58

Note: This commit moves the entity-hanging tick into Spigot's spigot.yml and out of our paper.yml
2014-08-25 16:30:52 -05:00
Zach Brown
2377cf1414 Update from upstream SpigotMC
Included Commits:
Update IRC channel to irc.spi.gt SpigotMC/Spigot@a791c555e7
Remove inv close patch for now SpigotMC/Spigot@a3abb3bea9
Limit TNT Detonations per tick SpigotMC/Spigot@8f9c601aed
Use sane default config values SpigotMC/Spigot@1cbbb9b62e

These commits were not included as they were quickly reverted:
Only close if we are actually placing a block SpigotMC/Spigot@ea0b1b2d67
Revert for the above SpigotMC/Spigot@28faa0bd20
Add isUnbreakable and setUnbreakable to ItemMeta. Also fixes a bug wh... SpigotMC/Spigot@32e6d74a5f
Revert for the above SpigotMC/Spigot@4b5a26b11c
2014-08-24 02:40:45 -05:00
Zach Brown
5bbc6ad511 Update from upstream SpigotMC
Skip invalid enchants in CraftMetaItem SpigotMC/Spigot@542e0798da
2014-08-19 13:40:15 -05:00
Zach Brown
b742f7a892 Update from upstream SpigotMC
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
2014-08-18 10:43:17 -05:00
Zach Brown
2f95e1a840 Update from upstream SpigotMC
Fix empty `ench` tags being wiped by the meta system SpigotMC/Spigot@cc9a1a417f
Add Hunger Config Values SpigotMC/Spigot@2cd515e224
Make debug logging togglable SpigotMC/Spigot@d31b1d616f

Spigot has implemented a system of hunger exhaustion similar to ours, as such a lot of config values have been moved there.
Our exhaustion patch has been trimmed and only a few values for exhaustion remain in paper.yml, the others now sit in spigot.yml
2014-08-17 16:47:36 -05:00
Zach Brown
a243d1abe5 Update from upstream SpigotMC
Fix Corrupted Trapped Chests SpigotMC/Spigot@08de30ca3e
Don't time async events SpigotMC/Spigot@c3a9e71da3
2014-08-15 14:35:58 -05:00
Zach Brown
72deca29a0 Update from upstream SpigotMC
Part revert to fix (0) in place of file name SpigotMC/Spigot@2fbc1f2704
Fix the last PR SpigotMC/Spigot@b2199df3f7
2014-08-11 15:49:06 -05:00
Zach Brown
0e5c8b96fd Update from upstream SpigotMC
Abridged: Force close player inventories when they move/interact
This prevents modified clients from using the 2x2 crafting square as permanent storage

Force Close Inventory On Move SpigotMC/Spigot@db78a70788
Only close once, if needed SpigotMC/Spigot@b652de8e7f
Move to interact event closing SpigotMC/Spigot@b5378850d3
Disregard arm swings - racy SpigotMC/Spigot@f86634e280
2014-08-10 00:21:18 -05:00
Zach Brown
c42e01a8b4 Update from upstream SpigotMC
Upstream Merge (Bukkit + CraftBukkit) SpigotMC/Spigot@da20125dab
Plug WorldMap Memory Leak SpigotMC/Spigot@da20125dab
2014-08-08 17:15:42 -05:00
Zach Brown
034094e8d3 Update from upstream SpigotMC
Fix LEFT_CLICK_AIR detection when not in creative SpigotMC/Spigot@883534a72a
2014-08-07 14:33:06 -05:00
Zach Brown
47f9c99934 Update from upstream SpigotMC
Fixed: Check cast SpigotMC/Spigot@7efa75c63a
2014-08-06 18:00:55 -05:00
Zach Brown
e7c9889883 Update from upstream SpigotMC
Fix timings SpigotMC/Spigot@7d79f6bf5e
Fix the particle api using the wrong Material class SpigotMC/Spigot@f5a1e7a96f
2014-08-05 13:44:19 -05:00
Zach Brown
7a921fe094 Update CraftBukkit 2014-08-04 15:11:38 -05:00
Zach Brown
89c42dfe2c Upsteam fix missed diff from MC 1.3.1 Update
SpigotMC/Spigot@2e45f5d2fa
2014-08-01 03:51:00 -05:00
Zach Brown
e05d2a7780 Update from upstream SpigotMC
Merge the max health attribute patch into the previous one SpigotMC/Spigot@8d45fe7f77
Filter attribute modifiers which cause the attribute to go out of its range SpigotMC/Spigot@463a1eb595
2014-07-31 19:16:47 -05:00
Zach Brown
4453e4b71a Update from upstream SpigotMC
Skip online mode UUID lookups when in offline mode and not using Bungee. SpigotMC/Spigot@25b673fd7e
2014-07-30 03:39:03 -05:00
Byteflux
418c27e9c1 Better nerf for TNT Cannons ...
Drops the item
Applies to all Falling Block Entities
2014-07-30 03:35:19 -05:00
Zach Brown
651c32a5f7 Update from upstream SpigotMC
Set the minimum max health attribute value to 0.1 SpigotMC/Spigot@d3b9fa0d1f
Add an option for a global cache for any request on Mojang's api SpigotMC/Spigot@3452c620df
Handle cases where the api fails to return a profile SpigotMC/Spigot@6a6eff3319
2014-07-29 14:59:47 -05:00
Zach Brown
86c0528de1 Update from upstream SpigotMC
Allow Attribute Capping. SpigotMC/Spigot@fb3a9d38dd
Fix unit tests (broken in the above) SpigotMC/Spigot@1e98f1161f
Update attribute maxes again once loaded SpigotMC/Spigot@2bf4481e15
2014-07-28 03:00:45 -05:00
Zach Brown
595e74227b Fix CraftBukkit-Patches/0032 that got mangled in the upstream update 2014-07-27 14:26:04 -05:00
Zach Brown
b6b4545b44 Update from upstream SpigotMC
Make "moved too quickly" limit configurable SpigotMC/Spigot@99a0a640e8
Undeprecate Player#updateInventory()V SpigotMC/Spigot@5c32e1cb48
Fetch complete profile for skull items, similarly to TileEntitySkull. SpigotMC/Spigot@33d758773e
Move getDouble into the Spigot Configuration patch SpigotMC/Spigot@b5dd202af1
Add missing particle to particle API SpigotMC/Spigot@273c64bbad
Log debug levels to the log file. SpigotMC/Spigot@348eae75f4
Fix PlayerItemDamageEvent (we already had this #badupstreamrelations) SpigotMC/Spigot@e207ea23cd
Move hopper patch to top for PR180 SpigotMC/Spigot@abb775108d
Don't be so spammy on Java 6 SpigotMC/Spigot@5abb82b1ca
Apply NBTReadLimiter to more things SpigotMC/Spigot@408944e9f5
2014-07-27 14:14:24 -05:00