SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,163 Commits 3 Branches 0 Tags
ec95eb86f7e6aafa4022f651e69df32d8b400a40
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Brown 44ddc211c4 Update upstream 2016-06-01 22:52:52 -05:00
Zach Brown 44857e00e2 Merge pull request #310 from MyPlayPlanet/server-name-param 
Add server-name as server parameter
 2016-05-29 18:35:03 -05:00
Zach Brown 6c11d95680 Update upstreams 2016-05-29 18:32:21 -05:00
Zach Brown a618f33267 Stop relocating jopt-simple 
Workaround for GH-189
Relocation breaks the lookup of a resource bundle, and this is easier than forking and maintaining our own version
 AFAIK this should be fine to do. Guess we'll see
 2016-05-29 18:26:35 -05:00
Zach Brown ff2c1ee38e Update upstreams 2016-05-27 21:22:18 -05:00
Zach Brown 50277c2ceb Remove comment and fix build }}}}} 2016-05-22 21:20:15 -05:00
Zach Brown 4e74c43218 Re-add some method synchronization and move to a SingleThreadedExecutor in MCUtils 2016-05-22 21:14:17 -05:00
Zach Brown 87366c4f4d Temporarily remove synchronization from UserCache optimizations 
In regards to GH-301
 2016-05-22 21:07:40 -05:00
Zach Brown 5f6f6c6321 Update old TNT cannon mechanics patch to 1.9.4 
Behavior may be buggy or otherwise broken, testing with the option is needed.
`fix-cannons` has been removed in favor of `enable-old-tnt-cannon-behaviors`
 2016-05-22 20:26:15 -05:00
Zach Brown 32ea7542d2 Update upstream CB 
Closes GH-303
 2016-05-21 22:07:14 -05:00
Zach Brown 143ab568d4 Update B/CB/S 
Closes GH-288
 2016-05-20 17:32:50 -05:00
Zach Brown af4db4ddea [16:55:31] *mibby pokes upstream 2016-05-16 17:00:53 -05:00
Zach Brown b9c321ff21 TileEntityLootable can call processRefill with a null player 
Seems specific to EntityMinecartChest
Fixes GH-290
 2016-05-15 01:41:36 -05:00
Zach Brown f623f903cd Move bad command registration workaround into SMP#dispatch 
Fixes GH-274
 2016-05-13 00:13:38 -05:00
Zach Brown f30c245be2 Make watchdoge disabler its own patch file 
Change implementation, smaller diff, less NPE
 2016-05-12 23:04:49 -05:00
Zach Brown 3b4f1c9497 Merge pull request #279 from DemonWav/tmux 
Add tmux support to Paper test and add test to paper command help.
 2016-05-12 13:09:51 -05:00
Zach Brown 324bde1f10 Make beacons force secondary potion effect application 
Fixes GH-273
Missed case from earlier fix 29dccccac4
 2016-05-08 15:33:53 -05:00
Zach Brown d8d75b106c Merge pull request #269 from Gabscap/fix-entity-tracker 
Add null-check to "Entity Tracking Improvement"
 2016-05-06 09:47:21 -05:00
Zach Brown b6da0fdf02 Move this somewhere sane 2016-05-05 20:18:20 -05:00
Zach Brown da5cd0a63e Revert "Add debug property to disable the watchdog" 
This reverts commit d1c470756f962801e7d3bc19bee9440f33a4706e.
 2016-05-05 20:10:32 -05:00
Zach Brown 139c4ccf0d Add debug property to disable the watchdog 
Use at your own risk, we will not waste our time with support
if your server times out and you cant put 2+2 together to
figure out that its because you killed the watchdoge
 2016-05-05 20:02:38 -05:00
Zach Brown 81f624837f Timings v2: Plugins don't always register commands properly 
*mumbles*
 2016-04-30 00:09:29 -05:00
Zach Brown 8c96f893c8 Update CB 2016-04-26 23:15:39 -05:00
Zach Brown c2407019bf SPIGOT-1401: Fix dispenser/dropper/furnace placement being different from SP 2016-04-24 19:56:04 -05:00
Zach Brown ee1ea990e1 Update CB 2016-04-24 19:27:43 -05:00
Zach Brown ef8ee10bd6 Update CB + Paperclip 2016-04-23 15:47:25 -05:00
Zach Brown 36394d5284 Update upstream Spigot and rebuild 2016-04-22 22:20:34 -05:00
Zach Brown 4f702e43e9 Merge pull request #234 from kashike/this-is-not-the-fly-you-are-looking-for 
Fix wrong variable being checked. Fixes #233
 2016-04-22 21:01:26 -05:00
Zach Brown 088c935ff4 Check entity count adds and mark entities removed as needed 2016-04-22 20:35:24 -05:00
Zach Brown 2c501cabe6 More involved workaround for vehicle event cancellation 2016-04-22 17:01:28 -05:00
Zach Brown 1ed12cfca6 Fix EntityDismountEvent and VehicleExitEvent cancellation 
Perhaps "workaround" would be the better term
 2016-04-22 15:45:22 -05:00
Zach Brown ebff483051 EntityHealthRegain isFastRegen API 2016-04-22 01:48:49 -05:00
Zach Brown c385ec89b5 Merge pull request #212 from willies952002/feature/permReload 
Also Reload Plugin-Defined Permissions
 2016-04-22 00:58:32 -05:00
Zach Brown 08cfefeb50 Update upstream CB and rebuild 2016-04-20 11:58:49 -05:00
Zach Brown 2197b74f38 Re-add PlayerLocaleChangeEvent implementation 
Apparently this was missed at some point, likely during the 1.9 update"
 2016-04-19 14:24:55 -05:00
Zach Brown dea3485028 Remove non-zero BlockIterator block and Loading chunks earlier in player TP patches 
Allowing only non-zero BlockIterators breaks an API contract explicitly allowing them
(*eyeroll*)

And loading chunks earlier in the TP patch did not resolve the original issue, and now
that it is resolved, shouldn't actually provide any tangible benefits
 2016-04-18 09:40:58 -05:00
Zach Brown 85e00ed1ab Update upstream B/CB 2016-04-17 13:36:39 -05:00
Zach Brown ba9ed5a3f1 Add arguments to test server to allow local debug 2016-04-17 13:32:55 -05:00
Zach Brown f44524249f Don't check velocities on Projectiles 
Closes GH-217
 2016-04-17 13:32:19 -05:00
Zach Brown 08a99f183a Merge pull request #216 from Searchndstroy/master 
Fix silly Javadocs in Bukkit.broadcast(BaseComponent) and Bukkit.broadcast(BaseComponent...)
 2016-04-16 15:34:37 -05:00
Zach Brown d42782457e Check the block water mobs spawn in, not the block under 2016-04-15 15:49:39 -05:00
Zach Brown 19eb02cab0 Revert "Only check for async callers, do not remove potentially used variables" 
This reverts commit 271e7c5cb4.
 2016-04-14 19:26:57 -05:00
Zach Brown d48896cf0e Z plays with scripts and GPG part 2 2016-04-13 22:39:54 -05:00
Zach Brown 9f0a7201a1 Water mobs should only spawn in the water 
Closes GH-199
 2016-04-14 17:49:11 -05:00
Zach Brown 271e7c5cb4 Only check for async callers, do not remove potentially used variables 
Potentially resolves GH-138
 2016-04-14 16:48:52 -05:00
Zach Brown 92d86e55ed Merge pull request #205 from kashike/feature/handshake 
Add handshake event
 2016-04-13 23:10:34 -05:00
Zach Brown b53c80ce35 Revert "Z plays with the scripts and GPG some more" 
This reverts commit e3e56baeea.
 2016-04-13 22:39:54 -05:00
Zach Brown 567224a84c Update bungeecord chat API graduations 2016-04-13 22:18:46 -05:00
Zach Brown e3e56baeea Z plays with the scripts and GPG some more 2016-04-13 22:05:59 -05:00
Zach Brown 0472876995 Re-add Configurable Player Collision 
Nothing to see here, move along
 2016-04-13 02:11:40 -04:00
Zach Brown 1aa718c217 Only allow non-zero value maxDistances for BlockIterators 
Prevents them from iterating infinitely and hanging the server
 2016-04-12 23:08:55 -05:00
Zach Brown 14f6bee0a1 Update upstream 2016-04-12 11:31:54 -05:00
Zach Brown f54aa3ca2c Update upstreams 2016-04-11 10:30:12 -05:00
Zach Brown 348469459d Ugly workaround for SPIGOT-1915 & GH-114 
Closes GH-114
 2016-04-10 03:24:54 -05:00
Zach Brown 88d2d15bb4 Apply the Ensure inv drag is in bounds patch properly 
Closes GH-174
 2016-04-09 21:33:29 -05:00
Zach Brown 309e2bd0d3 Update upstream CB 2016-04-09 20:44:54 -05:00
Zach Brown 15168bcbbe Update .travis.yml while we're here 
Just in case we ever need it again
*cough* or they loosen up their restrictions on system use *cough*
 2016-04-09 14:01:01 -05:00
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