mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 00:39:45 +00:00
Code Issues Projects Releases Wiki Activity
7,715 Commits 16 Branches 439 Tags
Commit Graph

7715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan K. Taylor
d67149376d Merge branch 'release/3.1' 2018-06-22 17:48:09 +01:00
Dylan K. Taylor
4c9ca53b32 Merge branch 'release/3.0' into release/3.1 2018-06-22 17:47:33 +01:00
Dylan K. Taylor
484d34fe04 Living: Reset attack cooldown before applying post damage effects 
this fixes things causing damage during post-damage calls coming back and being able to do even more damage
 2018-06-22 17:47:11 +01:00
Dylan K. Taylor
6c6630d845 Player: avoid doing some post-melee attack actions if attacking killed the attacker 
This can happen when an attacker attacks a victim wearing thorns armour while having low health, which prior to this commit would cause the tool to be duplicated.
 2018-06-22 17:17:40 +01:00
Dylan K. Taylor
a5a236084f Living: don't applyPostDamageEffects() for dead mobs 
this has already been seen to cause duplication bugs when thorns is used. Anything else that modifies inventory during applyPostDamageEffects() when the mob is possibly dead will also cause duplication issues.
 2018-06-22 14:31:48 +01:00
Dylan K. Taylor
78aa1ee22e Merge branch 'release/3.1' 2018-06-22 13:42:29 +01:00
Dylan K. Taylor
390db976e5 Arrow: allow controlling pickup mode (like PC) 
This allows controlling how arrows are picked up:
- by anything
- by only creative players
- by nothing

This adds new API methods to Arrow:
- getPickupMode()
- setPickupMode()

This adds new public constants to Arrow:
- PICKUP_NONE
- PICKUP_ANY
- PICKUP_CREATIVE
 2018-06-22 13:40:32 +01:00
Dylan K. Taylor
98ac534820 bump version 2018-06-22 13:22:11 +01:00
Dylan K. Taylor
641a5a5e23 fixed damaged anvils dropping the wrong items 
they changed this in 1.2.13 to use regular masks instead of bitshifts. The item was fixed, but not the block.
 2018-06-22 09:57:39 +01:00
Dylan K. Taylor
f60b0e5cc7 Server: more dev build warnings 2018-06-22 09:40:33 +01:00
Dylan K. Taylor
9a6a5e2088 submodule updates 2018-06-22 09:36:07 +01:00
Dylan K. Taylor
23085bf9b3 Merge branch 'master' of https://github.com/pmmp/pocketmine-mp 2018-06-22 09:14:03 +01:00
Dylan K. Taylor
0948c65276 Merge branch 'release/3.x' 2018-06-22 09:13:49 +01:00
Dylan K. Taylor
ebacb8525f SignPost: fixed possible field read on null 2018-06-22 09:12:48 +01:00
Dylan K. Taylor
579ab5866b Versions again 2018-06-22 09:12:48 +01:00
Dylan K. Taylor
2308eadf53
Add ExamplePlugin to README 2018-06-21 22:15:50 +01:00
Dylan K. Taylor
eddd626461 Trapdoor: fixed condition for side checking 2018-06-21 20:13:26 +01:00
Dylan K. Taylor
8a65941489 reeeeee 2018-06-21 20:01:27 +01:00
Dylan K. Taylor
99a0c2a188 Block: Make recalculation of BB non-dependent on block position 
This now computes BBs relative to 0,0,0 and then offsets them as appropriate. This requires less boilerplate code and also furthers the goal of separating block types from instances.
 2018-06-21 19:58:28 +01:00
Dylan K. Taylor
56b04fa0bb disable dev flag 3.0.2 2018-06-21 12:55:36 +01:00
Dylan K. Taylor
95787c2be9 TaskScheduler: fixed tasks not getting destroyed when all tasks in scheduler are cancelled before next heartbeat 
they got removed from the tasks array, but not from the queue (for performance reasons). The queue gets cleaned up by the heartbeat, but it was checking if there were things in the main array, not in the queue.

There are a couple of other bugs with cancelling tasks that this doesn't fix that are rather more complicated to deal with.
 2018-06-21 12:49:08 +01:00
Dylan K. Taylor
7b7be9618c PluginBase: fixed plugin task timings showing "Unknown" for plugin name 2018-06-21 12:05:30 +01:00
Dylan K. Taylor
4a8232d591 MemoryManager: Fixed parent private properties not being visible in memory dumps 2018-06-21 12:03:05 +01:00
Dylan K. Taylor
40e5a1aacb versions again 2018-06-21 12:03:05 +01:00
Dylan K. Taylor
dbda044229 bump version 3.0.1 2018-06-19 18:34:19 +01:00
Dylan K. Taylor
d2a037de71 InventoryTransaction: Avoid crashing when trying to compact slot changes with invalid slot numbers 
fixes #2250
 2018-06-19 18:31:13 +01:00
Dylan K. Taylor
03510333dc Disable dev flag for 3.0.0 release 3.0.0 2018-06-18 19:46:23 +01:00
Dylan K. Taylor
064e9464bc Removed --enable-profiler CLI option 
krakjoe's profiler hasn't been updated since 2013. I doubt it's going to get updated in the near future. These days we use xdebug, which is either always on or always off.
 2018-06-18 12:27:51 +01:00
Dylan K. Taylor
2d3ce9e8b0 Remove some fully qualified function calls 
PhpStorm can't see these or understand how they are being called, which is very annoying for bug hunting. Additionally, we already have the CodeOptimizer for this.
 2018-06-18 12:23:19 +01:00
Dylan K. Taylor
49f80830a7 Clean up unused imports 2018-06-18 12:10:27 +01:00
Dylan K. Taylor
80daaf09b2 SendUsageTask: fixed oops x2 (thanks PhpStorm) 
looks like this file was somehow missed during the refactor.
 2018-06-18 12:08:55 +01:00
Dylan K. Taylor
30ad3a1705 RCONInstance: inherit runtime-defined INI entries 2018-06-18 10:32:17 +01:00
Dylan K. Taylor
4e7d1a7947 fixed doxyfile 2018-06-17 19:59:45 +01:00
Dylan K. Taylor
da6439e3f4 SendUsageTask: fixed oops 2018-06-17 16:13:05 +01:00
Dylan K. Taylor
5f2d4c36c0 Updated Language submodule 2018-06-17 13:04:34 +01:00
Dylan K. Taylor
1f9bed275a Merged server and API version 2018-06-17 12:54:18 +01:00
Dylan K. Taylor
77f3ca4d47 PluginManager: make isCompatibleApi() a bit less sub optimal 2018-06-17 11:13:48 +01:00
Dylan K. Taylor
d88368ceb6 BlockBreakEvent: rename inconsistently-named function 2018-06-16 19:17:13 +01:00
Dylan K. Taylor
f77a829a52 LevelDB: remove redundant check 
Assume that entities on a chunk are not closed... none of the other providers check this
 2018-06-16 18:00:26 +01:00
Dylan K. Taylor
f315aca4c3 Tile: make saveNBT() return a CompoundTag 
I don't know why I made it take a parameter for this...
 2018-06-16 17:59:41 +01:00
Dylan K. Taylor
9f7f62e9e5 Don't use Config for builtin JSON resources 
it doesn't make sense to use a config in these cases, and also it just hides problems when the files are missing.
 2018-06-16 16:35:47 +01:00
Oreo Oreoniv
cc97f76ec9 Added plugin_data folder to .gitignore (#2243) 2018-06-15 12:49:08 +01:00
Dylan K. Taylor
3b0aad38cf PocketMine.php: Stop telling noobs to use an installer that doesn't exist 2018-06-15 09:57:08 +01:00
Dylan K. Taylor
a9b7cd1699 VersionString: Always consider dev builds less than release builds 2018-06-14 13:12:18 +01:00
Dylan K. Taylor
37b65aac91 AutoUpdater: Use update info for build number instead of trying to parse the version number 
the version number might not include the build number, particularly for releases.
 2018-06-13 18:19:17 +01:00
Dylan K. Taylor
ad7787e13b PluginLoader: fixed access protocol, updated devtools 2018-06-13 17:22:29 +01:00
Dylan K. Taylor
7b0ce16b12 Fixed buckets being able to delete any block 2018-06-13 17:05:51 +01:00
Dylan K. Taylor
0ff6b7b572 PluginManager: Track enabled plugins in a separate array 2018-06-13 16:54:04 +01:00
Dylan K. Taylor
763e20ba4e Server: prevent stupidity with settings.async-workers 2018-06-13 16:44:40 +01:00
Dylan K. Taylor
4b99285fd6 PocketMine.php: remove unused function 2018-06-13 16:33:48 +01:00