SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,031 Commits 3 Branches 0 Tags
5cbb907ff1e0e53ccbe4dfd2cff4e9096f65319d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Brown 5cbb907ff1 Can't expect others to follow formatting if I don't 2016-04-09 13:54:47 -05:00
Zach Brown b6dd739ed4 Update B/CB 2016-04-09 13:51:47 -05:00
Zach Brown b605f1f95f Backport a memory cleanup change from 16w14a 2016-04-09 13:48:06 -05:00
Zach Brown c7bdf516da Update upstreams and rebuild 2016-04-08 17:24:26 -05:00
Zach Brown d6b1996ab3 Simplify vanilla scoreboard nickname coloring patch 
Closes GH-195
 2016-04-07 17:31:06 -05:00
Zach Brown 85a924b7dd Move comment to its proper location 2016-04-07 01:39:54 -05:00
Zach Brown d158c69570 Disable, Enable GPG signs as needed Pre, Post git am 
Disable GPG signing before AM, slows things down and doesn't play nicely.
There is also zero rational or logical reason to do so for these sub-repo AMs.
It's re-enabled (if needed) immediately after, pass or fail.

Given GitHub's recent push for GPG signing, and our own testing, this is not
only helpful, but necessary.
 2016-04-07 01:36:23 -05:00
Zach Brown 933829f334 Update upstream B/CB/Spigot 2016-04-07 00:32:10 -05:00
Zach Brown b9f596b8d2 Add basic support for using vanilla style, world-based, scoreboard name coloring 
Closes GH-188
 2016-04-06 01:10:26 -05:00
Zach Brown d79fcf72fa Use 'Paper' for our config file in timings 2016-04-05 23:27:53 -05:00
Zach Brown b4a0af94bb Upstream merge 2016-04-05 11:42:40 -05:00
Zach Brown 3506f09ca7 Update upstream and rebuild 2016-04-04 09:53:03 -05:00
Zach Brown 6d4ec62128 Merge pull request #185 from kashike/feautre/shell 
Add support for multiple shell types
 2016-04-03 21:53:08 -05:00
Zach Brown 4d3d778c5c Merge branch 'kashike-feature/debug-info' 2016-04-03 05:10:50 -05:00
Zach Brown 562cf2ea2e 'Properly' fix rebuildpatches 2016-04-03 05:05:52 -05:00
Zach Brown 714f7cdf28 Merge branch 'kashike-feature/unknown-use' 2016-04-03 04:53:55 -05:00
Zach Brown d7c909b5cb Merge branch 'feature/unknown-use' of https://github.com/kashike/Paper into kashike-feature/unknown-use 2016-04-03 04:52:36 -05:00
Zach Brown cc6460fd5e lazy-update docs 2016-04-03 04:51:14 -05:00
Zach Brown 2887b5ee56 Merge pull request #177 from DemonWav/cleanup 
Cleanup and restructure the project
 2016-04-03 04:18:25 -05:00
Zach Brown 9fe95d850e Mark chunk as active if ChunkUnloadEvent is cancelled 
Potentially related to GH-169
 2016-04-03 02:02:00 -05:00
Zach Brown b6e39d3f5c We don't need to go fast anymore 2016-04-03 02:00:35 -05:00
Zach Brown b1fa9587b6 Merge pull request #173 from DemonWav/master 
<~Z750> sex it up for me
 2016-04-01 02:00:36 -05:00
Zach Brown d89da5a2ad gottagofast 2016-04-01 01:33:12 -05:00
Zach Brown 0a01580011 Upstream merge CB, rebuild patch 2016-03-31 12:58:20 -05:00
Zach Brown a01a25ff57 Missed diff, unused config entry, general cleanup 
cc GH-170
 2016-03-30 22:55:46 -05:00
Zach Brown e96190ed9e Update CB/Spigot : Add 1.9.2 protocol 
/me rolls eyes
 2016-03-30 11:03:20 -05:00
Zach Brown bb5359725b Update CB/Spigot : Add 1.9.1 protocol 2016-03-30 10:15:07 -05:00
Zach Brown 50811b1ca5 Skip dead entities in getEntity(UUID) API 2016-03-30 09:41:12 -05:00
Zach Brown 572da383b9 Merge pull request #167 from DemonWav/getentity 
Add getEntity by UUID API
 2016-03-30 01:30:29 -05:00
Zach Brown 3a4b55aa5d Put this patch in the patches folder, so it's actually used 2016-03-29 13:56:19 -05:00
Zach Brown 0c7a0d7c98 Merge pull request #163 from cybertiger/region-file-cache 
Sanitise RegionFileCache and make cache size configurable.
 2016-03-29 11:15:30 -05:00
Zach Brown a3b6db55c2 Merge pull request #162 from cybertiger/region-file-io-ops 
Reduce IO ops opening a new region file.
 2016-03-29 11:15:23 -05:00
Zach Brown 3685425eaa Merge pull request #158 from Minefabser/fix-minecart 2016-03-28 22:41:54 -05:00
Zach Brown 35fa26813f Update upstream B/CB 
Notably to limit byte array length
 2016-03-28 15:21:26 -05:00
Zach Brown 51c738e817 Don't set spawn world in PlayerInitialSpawnEvent 
Fixes GH-85 and GH-157
 2016-03-28 13:00:44 -05:00
Zach Brown 010e7652b3 Fix player tab list API 2016-03-28 10:41:04 -05:00
Zach Brown 587aaefcc4 Update upstream B/CB/Spigot and rebuild 2016-03-27 20:48:50 -05:00
Zach Brown 4634458d72 Check async spawn chunk check, remove unused variables, GH-159 2016-03-27 20:31:23 -05:00
Zach Brown 8ec0ce4b89 Merge pull request #153 from kashike/feature/slot 
Access items by EquipmentSlot
 2016-03-27 02:24:12 -05:00
Zach Brown 1109dc8d70 Update upstream and rebuild 2016-03-27 01:38:58 -05:00
Zach Brown 8c448684ad Merge pull request #152 from DemonWav/blockPosInfLoop 
Prevent possible infinite loop in BlockPosition iterator
 2016-03-26 22:30:04 -05:00
Zach Brown 4e19bc5653 Merge pull request #149 from Gabscap/fix-teleport 
Load chunks before player teleport - Fixes #147
 2016-03-26 16:17:38 -05:00
Zach Brown c29fb9c5e2 Merge pull request #148 from meytro/patch-1 
Update ISSUE_TEMPLATE.md
 2016-03-26 16:17:25 -05:00
Zach Brown 32ac0a9a4b Pull in ArrowPickupItemEvent and legacy dataconverter fix from SportBukkit 2016-03-26 03:38:02 -05:00
Zach Brown 986af4b11d Update upstream CB/Spigot 
cc GH-146
 2016-03-26 01:38:02 -05:00
Zach Brown 95adcf7863 Merge upstream changes and rebuild patches 2016-03-25 18:21:38 -05:00
Zach Brown 3769b651be Merge pull request #140 from Ichbinjoe/issue 
Add issue template
 2016-03-25 16:16:33 -05:00
Zach Brown eb5c119269 Re-add TileEntity removal list, fix build 2016-03-25 02:50:56 -05:00
Zach Brown 482147a830 Update upstream CB 2016-03-25 02:30:39 -05:00
Zach Brown 926ba9a3bb Update upstream B/CB 
Remove patch 0099: Pulled into upstream CraftBukkit
 2016-03-24 01:39:29 -05:00
Zach Brown b53fc3a382 Merge pull request #132 from Gabscap/fix-applypatches 
Fix build error
 2016-03-23 17:55:27 -05:00
Zach Brown 65c5b95059 Update upstream repos 2016-03-23 01:08:50 -05:00
Zach Brown d1afdd87f4 Clean up title and tab list patch 
Remember kids, the Ballmer peak is hard to hit https://xkcd.com/323/
Finally fixes #126 and #94 (I tested, it does, please, really, promise)
 2016-03-23 01:05:09 -05:00
Zach Brown fb05841421 How does typing work? 
Closes GH-125
 2016-03-22 14:55:42 -05:00
Zach Brown 71d9f402d5 Configurable spawn chances for skeleton horses 
Closes feature request GH-111
 2016-03-22 12:07:16 -05:00
Zach Brown e491f33acd Update upstrem CB 2016-03-22 11:14:32 -05:00
Zach Brown f309e30873 Update upstream CB 2016-03-22 00:43:44 -05:00
Zach Brown 2241a54955 Update upstream Spigot and upstreamMerge script 
Also remove paperclip from upstream merge, it shouldn't need merging very often
 2016-03-21 12:32:05 -05:00
Zach Brown 044d463764 Use singleton in Village class to work around null issue that evades 2016-03-21 10:28:45 -05:00
Zach Brown 7107d8ae53 Upstream merge Bukkit, update Paperclip 2016-03-21 09:03:17 -05:00
Zach Brown d4ba72a83f Support offline mode from the whitelist command 
Closes GH-79
 2016-03-21 00:53:32 -05:00
Zach Brown 71f8b70f10 Also handle original end case that spawned the issue 
Final commit for GH-96 if there's any justine in the world
 2016-03-20 23:15:37 -05:00
Zach Brown c0d5c00a34 Merge pull request #118 from Techcable/fix/spigot-title-compatibility 
Fix backwards compatibility with spigot title api
 2016-03-20 22:53:57 -05:00
Zach Brown a7d5440958 Merge pull request #117 from willies952002/correct/README 
Update README.md
 2016-03-20 22:40:41 -05:00
Zach Brown 614aee73bc Only mark player as invulnerable if they're actually changing worlds 
Fixes GH-96
 2016-03-20 22:38:31 -05:00
Zach Brown 84b79f3f41 Only mark player as invulnerable if they're going to the end 
cc GH-96
 2016-03-20 19:44:49 -05:00
Zach Brown 372152df9d Upstream merge 2016-03-20 16:05:42 -05:00
Zach Brown 86800546bf Merge latest upstream CB 2016-03-19 21:42:04 -05:00
Zach Brown a424df3323 Update upstream and rebuild patches 2016-03-19 20:20:25 -05:00
Zach Brown 85451753d1 Remove patch pulled upstream and rebuild patches 2016-03-19 17:52:09 -05:00
Zach Brown 67a3d9cb57 Merge pull request #101 from DemonWav/master 
Revert Spigot changes to blocking damage code
/me glances at imports
/me will fix later
 2016-03-19 12:25:22 -05:00
Zach Brown a8dc98774c Update upstreams & paperclip 
Should close GH-86
 2016-03-19 08:38:35 +11:00
Zach Brown eaccfc64b2 Re-add comment to navigation patch 2016-03-18 21:41:50 -05:00
Zach Brown 3727b119f2 Update upstream and rebuild patches 2016-03-18 21:37:58 -05:00
Zach Brown 659c43c6f3 Fix furnace cook time bug 2016-03-18 21:32:31 -05:00
Zach Brown c7fec9299a Make spawner nerfed mobs float AI toggleable 
closes GH-57
 2016-03-18 21:10:20 -05:00
Zach Brown 29dccccac4 Force potion effect application in BeaconEffectEvent 2016-03-18 20:45:22 -05:00
Zach Brown bccbc72945 Move config change into config patch 2016-03-18 16:41:26 -05:00
Zach Brown 14d5dba144 Upstream changes 2016-03-17 23:29:51 -05:00
Zach Brown d61ce9271e Merge pull request #84 from Techcable/fix/null-titles 
Don't pass null title to constructor
 2016-03-16 21:13:59 -05:00
Zach Brown 59ca434484 Someone questioned my professionality today 2016-03-16 02:57:49 -05:00
Zach Brown 2a6b5b76de Fix the end credits toggle 
I think its pretty clear that no one uses this given that it didn't work at all before
 2016-03-16 02:21:39 -05:00
Zach Brown b49a1ff6a9 Update upstream B/CB 2016-03-15 22:37:52 -05:00
Zach Brown ced7408da1 Merge pull request #82 from willies952002/patch-1 
Fix Errors in Contributing.md
 2016-03-15 15:42:44 -05:00
Zach Brown c8d7ee5b8a Update Contributing.md for 1.9 name/repo changes 2016-03-15 12:51:03 -05:00
Zach Brown ad72109859 Upstream 
*glances around*
 2016-03-14 23:16:29 -05:00
Zach Brown 4737222c03 Hey look more updates upstream 2016-03-14 00:59:05 -05:00
Zach Brown 342ce539de Update CB 2016-03-14 00:26:11 -05:00
Zach Brown e9fa398578 Update B/CB 2016-03-12 17:08:03 -06:00
Zach Brown b7d6f29245 Update and rebuild patches 2016-03-12 13:52:49 -06:00
Zach Brown d230ac7ef2 Re-add Spigot's hopper-check feature 
Closes GH-77
 2016-03-12 13:41:26 -06:00
Zach Brown 0d320773fd Merge pull request #78 from Techcable/feature/asm-executors 
Handle static event methods
 2016-03-12 12:20:35 -06:00
Zach Brown 22ebfde4ad Update upstream 
hi @mibby
 2016-03-12 00:59:34 -06:00
Zach Brown a9f44f2240 Rebuild some patches 2016-03-12 00:40:16 -06:00
Zach Brown 716993c750 Fix BeaconEffectEvent 
It is no longer 5 am
 2016-03-11 20:36:47 -06:00
Zach Brown 9c189d350a Update upstream and rebuild patches 2016-03-11 20:13:31 -06:00
Zach Brown 88d1040bf8 Update upstream and rebuild patches 2016-03-11 15:24:37 -06:00
Zach Brown 745fa70bfd Update upstream CB 2016-03-10 15:10:04 -06:00
Zach Brown f91b836282 Update upstream B/CB 2016-03-09 19:49:59 -06:00
Zach Brown 67ae849417 Merge pull request #73 from kashike/feature/you-are-very-resourceful-you-know-yes-you-are-very-resourceful-yes 2016-03-09 19:45:55 -06:00