Commit Graph

62 Commits

Author SHA1 Message Date
Zach Brown
c9daa16dac Update from upstream SpigotMC
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
2014-12-05 21:33:40 -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
de86706b70 Update PaperSpigot to Minecraft 1.8 2014-11-28 15:01:21 -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
7b0c576798 Restructure PaperSpigot as a new set of modules
Allows us much greater control over the Spigot portion of the code
and makes us more "proper"
Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 15:46:54 -05:00
Zach Brown
1207bc585d Apply our patches over Spigot-Server and Spigot-API directly 2014-06-24 08:04:20 -05:00
md_5
463e6f351e Shave nearly 2mb off jar size by not embedding our copy of trove since Minecraft now includes it. 2014-06-21 16:30:09 +10:00
Thinkofdeath
27cb8a7e6d Upstream merge 2014-06-02 15:38:03 +01:00
md_5
e052eada8c Upstream merge: conflict resolution and version bump 2014-05-15 17:05:45 +10:00
Thinkofdeath
e21770a060 Upstream merge 2014-05-14 14:02:09 +01:00
Thinkofdeath
4342681445 Upstream merge: 1.7.9 2014-04-17 20:50:10 +01:00
md_5
05b9fd72af Fix BanList command and other *list functionality 2014-04-17 19:03:18 +10:00
md_5
83ce6724ca Stage 1 2014-04-12 14:18:37 +10:00
md_5
f5167c9e46 Upstream: Add more expansive UUID based operations 2014-03-30 09:09:24 +11:00
Thinkofdeath
69324bba91 Update to 1.7.5 2014-03-23 00:06:43 +00:00
md_5
254df64f1b Rebuild patch hashes, fix build. 2014-03-10 09:14:45 +11:00
Thinkofdeath
5284bd1a74 Upstream merge 2014-02-12 14:06:33 +00:00
Thinkofdeath
31f53fbbbe Upstream merge 2014-01-31 20:42:29 +00:00
md_5
d3f7cce233 Revert Spigot branding. 2014-01-26 21:54:02 +11:00
md_5
6eefe4e38e Allow configuring of player sample size, and default the sample to 12, the same as Vanilla. This has some performance overhead, as we have to shuffle the list each time, but this is better than the server displaying as offline! 2014-01-26 21:50:53 +11:00
md_5
ab3c5a42f7 Revert "Experimentally brand as "Spigot". This will be reverted if *any* plugin compatibility issues arise."
This reverts commit 71255cf140.
2014-01-26 21:33:46 +11:00
md_5
71255cf140 Experimentally brand as "Spigot". This will be reverted if *any* plugin compatibility issues arise. 2014-01-26 09:17:40 +11:00
md_5
65a4f51285 Upstream merge 2014-01-15 20:28:26 +11:00
md_5
6a98142bd5 Fix patch tree. 2013-12-22 10:06:06 +11:00
md_5
1c099a713b Upstream merge, nothing major. 2013-12-21 19:13:39 +11:00
md_5
e9cb6ec3c5 Upstream merge 2013-12-18 17:48:18 +11:00
md_5
e770480d4b Fix shade fix accidentally being unmerged 2013-12-04 19:57:08 +11:00
md_5
c8145fb896 Actually fix division by 0 in growth 2013-12-03 09:05:49 +11:00
md_5
31572d6c20 Update maven shade plugin so that newer maven versions (ie travis) will compile. 2013-12-03 08:21:58 +11:00
md_5
cc7903bbf3 Upstream merge 2013-12-02 07:36:51 +11:00
md_5
80da3f0c9b Stage 1 2013-12-01 14:40:53 +11:00
md_5
cdbe22b7c7 Update master to R2 as well. 2013-11-05 10:46:34 +11:00
md_5
f775c4dbd1 Upstream Merge 2013-10-24 21:23:24 +11:00
md_5
7509839cdf Update to CraftBukkit 1.6.4 2013-09-20 11:46:45 +10:00
md_5
1b854cbe28 Upstream merge + remove 3 pulled patches. 2013-09-12 10:20:02 +10:00
md_5
e36ba8dd96 Upstream merge 2013-08-07 17:16:57 +10:00
md_5
6b60db4272 Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice. 2013-07-11 11:31:30 +10:00
md_5
9018b1d7ba Update Spigot to Minecraft 1.6.2 2013-07-09 10:31:10 +10:00
md_5
26f85d2572 Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
2013-07-04 20:05:41 +10:00
md_5
4d2619f099 Remove LocalLanguage patch for now 2013-07-02 13:14:40 +10:00
md_5
5d790af909 Update to Minecraft 1.6.1 - Phase 1 2013-07-02 13:03:56 +10:00
md_5
8cbfcf995d Compiling up to patch 10 2013-06-21 17:00:01 +10:00
md_5
0c7072f790 Refresh the hashes of all our patches so they are nicely in sync after our new RB. 2013-06-16 21:45:21 +10:00
md_5
2083a98e7b Update versions. 2013-06-15 19:08:22 +10:00
md_5
51ed9f651d Update to latest upstream 2013-05-04 09:24:53 +10:00
md_5
89c99e9d28 [CAUTION] Initial 1.5.2 update - I have NOT had time to TEST. DO NOT use on production server WITHOUT TESTING FIRST. 2013-05-01 08:40:33 +10:00
md_5
7c8c784aab FIx spacing 2013-04-23 11:35:18 +10:00
md_5
ce45aa074e Move version resolve check to initial POM patch 2013-04-23 11:32:07 +10:00