Commit graph

1056 commits

Author SHA1 Message Date
md_5
3ea2235dbd More conflict resolution. 2015-02-14 20:15:47 -06:00
md_5
6008bb8fab Fix merge conflicts. 2015-02-14 20:15:35 -06:00
Thinkofdeath
e1a6979f1a Fix entity activation range for fireworks and items 2015-02-14 20:15:26 -06:00
Thinkofdeath
450a0ff892 Upstream merge 2015-02-13 14:21:43 -06:00
Thinkofdeath
461353e2cb 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 09:03:19 -06:00
Thinkofdeath
4de67b82cf 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 23:58:01 -06:00
Thinkofdeath
d7dbedcf72 Fix merge conflicts 2015-01-25 21:56:18 -06:00
Thinkofdeath
a131bfb513 SPIGOT-459: Update the structure saving warning 2015-01-25 21:56:09 -06:00
md_5
86c8d0492a Fix merge conflicts. 2015-01-25 02:02:43 -06:00
Thinkofdeath
5ed9079a1b Me and windows are not getting along 2015-01-18 12:40:31 -06:00
Thinkofdeath
a7339d5ed5 Whoops 2015-01-18 12:40:23 -06:00
Thinkofdeath
3c20eb4a97 Upstream merge 2015-01-18 12:40:16 -06:00
md_5
478838714f Merge 2015-01-16 10:46:27 -06:00
Thinkofdeath
d41f0754f0 SPIGOT-326: Fix an overflow issue which caused particles to only show in a 1 block radius 2015-01-16 10:46:15 -06:00
md_5
bfc8900321 Merge in changes. 2015-01-16 10:39:55 -06:00
md_5
88b3850470 Allow sun JVM classes for Spigot 2015-01-12 11:15:19 -06:00
md_5
3de5e003f5 Upstream merge. 2015-01-12 11:15:14 -06:00
md_5
fb6f1e914b SPIGOT-401: Add async catcher for mob effects. 2015-01-12 11:15:07 -06:00
md_5
35f381961d Fix patches 2015-01-08 21:52:40 -06:00
md_5
384699a51a Upstream merge. 2015-01-06 22:09:08 -06:00
Zach Brown
b360cf686f Update from upstream SpigotMC
eb39b4729ce
59b08be5833
a723278f74a
2015-01-04 20:01:24 -06:00
Zach Brown
3650ca36dd Update from upstream SpigotMC take 2: Update harder 2014-12-27 16:07:04 -06:00
Zach Brown
250c1711bd Update from upstream SpigotMC
f234263c871
9f2d587b97e
6d85d979798
24ca434ad3c
5ffe41c3910
13716d9d5ee
2014-12-27 15:39:37 -06:00
Zach Brown
c7f1eed0bf Update from upstream SpigotMC
3beb7729816
a77ed5758a7
52c130fc6d9
2014-12-20 19:09:49 -06:00
Zach Brown
6a5e553feb Update from upstream SpigotMC
a3168ab2ce4
9b45d9fa8d3
b43a31a5c25
a926b96d5d1
d6b5ba7ca03
bb782d07aed
5a74d55c678
47b1dff3e68 [M]
2014-12-18 17:33:08 -06:00
Zach Brown
8bbab87c6b Update from upstream SpigotMC
3e3ea0bd0d8
320ed92779f
612de468951
2014-12-14 15:54:10 -06:00
Zach Brown
74110558b2 Update from upstream SpigotMC
81e4ab71ca4
b023457499d
dc776bee32b
116e6fc98dc
2b97a3846f2
2014-12-12 22:47:57 -06:00
Zach Brown
690205b676 Update from upstream SpigotMC
44608631338 [M]
29dbaa783fe
edf691c2e93
da9bbdfaea9
330d66bfb62
2014-12-10 22:21:51 -06:00
Zach Brown
1c211713c6 Update from upstream SpigotMC
c5492f80081
d5bf8668b99
a93b19a04cd
2014-12-09 19:58:37 -06:00
Zach Brown
28414e7e28 Update from upstream SpigotMC
6669d6ecd2b
b2740df50bb
bf71dc61149
fba27a2ea80
92ee7e7f8ec
b28f0d3de23
4beb4ac3918
0ddb6f3dde8
afe301fe892
b8f6402bbbe
2014-12-07 13:26:30 -06:00
Zach Brown
c9daa16dac Update from upstream SpigotMC
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
2014-12-05 21:33:40 -06:00
Zach Brown
2a30a76ac5 Merge with Spigot
da32fe1d549 <- Increase max scoreboard objective size
2014-12-03 18:13:06 -06:00
Zach Brown
c55b9c30d7 Update from upstream SpigotMC
66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
2014-12-02 00:02:15 -06:00
Zach Brown
19972e09b8 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
1c49ff69f4 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
06c1cf41ab Update Spigot's Patches
Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf

This new system breaks a lot :(
2014-11-28 18:03:01 -06:00
Zach Brown
de86706b70 Update PaperSpigot to Minecraft 1.8 2014-11-28 15:01:21 -06:00
Zach Brown
4100c7f703 Add Spigot binary patch 20141113a 2014-11-28 14:19:09 -06:00
Byteflux
2a92d3a54a Update with more Spigot binary patches 2014-11-28 14:19:09 -06:00
Byteflux
1a6b7c9d79 Update with latest patches from upstream SpigotMC 2014-11-28 14:19:08 -06:00
Zach Brown
cdbc7da18f 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-11-28 14:19:08 -06:00
Zach Brown
9a517de244 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-11-28 14:19:08 -06:00
Zach Brown
15b553bed3 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-11-28 14:19:07 -06:00
Zach Brown
cab333b217 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-11-28 14:19:07 -06:00
Zach Brown
495c399ff4 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
c777f40058 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:33:18 -05:00
Zach Brown
f7bb4ad8a3 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
e33fc912a7 Update from upstream SpigotMC
Skip invalid enchants in CraftMetaItem SpigotMC/Spigot@542e0798da
2014-08-19 13:40:15 -05:00
Zach Brown
5b4bc3081a Update from upstream SpigotMC
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
2014-08-18 10:43:17 -05:00
Zach Brown
a4647a8a71 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