SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,887 Commits 3 Branches 0 Tags
bd75ff8b5b715c3fdf587b6aa3c0f2ecc4bf3443
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zach Brown 4fba7d5bdc Merge pull request #71 from kashike/feature/what-are-these-pokey-things-OH-MY-GOD-HELP-THEY-HURT 2016-03-09 19:44:18 -06:00
Zach Brown 74b4a248ab Merge pull request #70 from starlis/fixCollisionLag 
Disable Scoreboards for non players by default
 2016-03-08 22:58:36 -06:00
Zach Brown 265f3e25fe Merge pull request #68 from starlis/makemcdev 
Add makemcdevsrc.sh
 2016-03-08 22:56:21 -06:00
Zach Brown 62e3bc6110 Merge pull request #67 from kashike/text-cereal 
Don't nest if we don't need to
 2016-03-08 20:31:26 -06:00
Zach Brown d995d003f4 Merge pull request #66 from starlis/improvNav 
Improve NavigationListener patches.
 2016-03-08 20:14:07 -06:00
Zach Brown 70a5fa4a9b Upstream merge 2016-03-08 18:20:45 -06:00
Zach Brown 4ff94ab64e Forcibly disable async light updates for the time being 2016-03-08 16:23:28 -06:00
Zach Brown cc04ef507a Merge pull request #64 from kashike/feature/components 
Add BaseComponent sendMessage methods to CommandSender
 2016-03-08 15:16:56 -06:00
Zach Brown 7a5780d2ac Update for upstream changes 2016-03-08 01:31:32 -06:00
Zach Brown 2ee19704e6 Merge pull request #63 from starlis/fixNavListener 
Optimize NavigationListener Iteration
 2016-03-07 23:44:52 -06:00
Zach Brown 49a8e615cf Merge pull request #62 from PaperSpigot/revert-61-fixNavListener 
Revert "Optimize NavigationListener Iteration"
 2016-03-07 22:24:52 -06:00
Zach Brown fa35cdb3a1 Revert "Optimize NavigationListener Iteration" 2016-03-07 22:24:18 -06:00
Zach Brown 0450f1ed96 Merge pull request #61 from starlis/fixNavListener 
Optimize NavigationListener Iteration
 2016-03-07 22:18:10 -06:00
Zach Brown 8db749d66b Rebuild patches 2016-03-07 15:54:14 -06:00
Zach Brown bd78e61b24 Upstream merge 2016-03-07 15:37:29 -06:00
Zach Brown 3c1f7052c2 Rebuild patches 2016-03-07 00:57:19 -06:00
Zach Brown 996dfe9f78 Update upstream CB 2016-03-07 00:26:57 -06:00
Zach Brown 65bd5d1259 Update and rebuild patches 2016-03-06 14:59:17 -06:00
Zach Brown d40b668c4b Revert "Update to latest and rebuild ALL patches" 
This reverts commit 21038c6f5c.
 2016-03-06 14:49:47 -06:00
Zach Brown 21038c6f5c Update to latest and rebuild ALL patches 2016-03-06 14:23:00 -06:00
Zach Brown f42ce21433 Update again: Update harder 2016-03-05 18:50:13 -06:00
Zach Brown 9d890f0f28 Remove our own changes to the chunk save queue 2016-03-05 16:10:11 -06:00
Zach Brown ee297d897c Update CB 2016-03-05 15:35:30 -06:00
Zach Brown 9fc52783a2 Fix chest sound playing at the wrong locaton 
Closes GH-48
 2016-03-04 17:38:51 -06:00
Zach Brown 102614d6cc Update against latest 2016-03-04 15:59:51 -06:00
Zach Brown 96074f3000 Rebuild patches 2016-03-04 15:20:13 -06:00
Zach Brown 9119a7b48c Update against latest upstream versions 2016-03-03 23:50:05 -06:00
Zach Brown 8196b13d6a Update CraftBukkit 2016-03-03 12:13:21 -06:00
Zach Brown 3a71da0bd3 Silence BeaconEffectEvent, swallow exception in version checking 2016-03-03 04:48:46 -06:00
Zach Brown d83453116b Update for upstream changes 2016-03-03 03:46:26 -06:00
Zach Brown 26eb457a39 Paper 1.9 2016-02-29 17:09:49 -06:00
Zach Brown a74ba1694d Submodules 2016-02-29 17:03:38 -06:00
Zach Brown 401ca5d1e0 Merge pull request #38 from Ichbinjoe/findPortals 
Add configurable portal search radius
 2016-02-22 21:20:02 -06:00
Zach Brown 09c69ae4df Update CB 2016-02-21 04:28:47 -06:00
Zach Brown 004b2d584f Proper maven repo details 2016-02-21 04:12:03 -06:00
Zach Brown e42db95777 Move bungeecord chat APIs out of spigot subclasses 2016-02-16 19:55:05 -06:00
Zach Brown 8e4a0c9deb Merge pull request #31 from kashike/feature/better-exceptions 
Be a bit more informative in maxHealth exception
 2016-02-16 18:48:14 -06:00
Zach Brown b90bec092f There wasn't anything here 
http://i.imgur.com/AxtzziK.gif
 2016-02-15 20:10:47 -06:00
Zach Brown b0092d1f74 Merge pull request #27 from kashike/feature/commandmap 
Expose server CommandMap
 2016-02-15 12:07:29 -06:00
Zach Brown 1a1422fd41 Ignore version formatting errors 
We have so many random strings around at the moment this will be better for now
 2016-02-15 08:31:45 -06:00
Zach Brown eedfd912d2 Some people just have bad days 2016-02-15 08:24:39 -06:00
Zach Brown 8ffb9ef6ea Downgrade versioning plugin, fix build 2016-02-15 08:22:37 -06:00
Zach Brown 134dc373d2 Update version handling for our new build system 
CC GH-19
 2016-02-15 06:02:47 -06:00
Zach Brown cb4c48c343 Missed a comment 2016-02-13 20:11:49 -06:00
Zach Brown b8355eed74 Add BlockBrewingStand and BlockEnchantmentTable to flying entity collisions patch 2016-02-13 19:11:20 -06:00
Zach Brown f434ee1467 Make timings verbose by default 
More useful data by default for server administrators
 2016-02-13 17:19:33 -06:00
Zach Brown df05971fe9 Merge pull request #25 from Martyn96/patch-1 
Fix typos in contributing.md
 2016-02-13 16:34:03 -06:00
Zach Brown 65c00bdbc1 Update Bukkit & CB 2016-02-06 17:13:36 -06:00
Zach Brown 22c4861d76 Update CraftBukkit 2016-02-05 04:12:16 -06:00
Zach Brown 3795e33bc1 Build Scripts: Be a little more explicit in paperclip.sh 2016-02-05 03:58:20 -06:00
Zach Brown a3fce6a8a0 Merge pull request #9 from Techcable/cancellable-EntityDismountEvent 
Make EntityDismountEvent Cancellable
 2016-02-03 03:09:18 -06:00
Zach Brown 81fd0288bb Update CraftBukkit 2016-02-01 23:42:45 -06:00
Zach Brown 9d79cc6b99 Squash these tab complete patches 2016-01-31 17:00:30 -06:00
Zach Brown 4895208d90 Merge pull request #5 from DemonWav/master 
Add Location support to tab-completes
 2016-01-30 20:29:13 -06:00
Zach Brown 9b641414e1 Update CraftBukkit 2016-01-30 20:22:11 -06:00
Zach Brown 5d94c8d562 Merge pull request #4 from Techcable/patch-1 
Fix mutable block position construction
 2016-01-29 18:02:24 -06:00