3846ee3d1d
reorganize and optimize start.sh ( #2267 )
2018-06-29 14:48:29 +01:00
d49a41f788
Merge branch 'release/3.1'
2018-06-29 12:31:04 +01:00
b04319a4ab
Merge branch 'release/3.0' into release/3.1
2018-06-29 12:30:52 +01:00
ca6930006c
back to dev
2018-06-29 12:30:08 +01:00
33eeeb856e
disable dev flag
2018-06-29 12:21:56 +01:00
4a11ded185
Merge branch 'release/3.1'
2018-06-29 12:19:32 +01:00
0afbf6c547
Merge branch 'release/3.0' into release/3.1
2018-06-29 12:19:25 +01:00
c43ce5c8fa
RCONInstance: apply stfu operator
2018-06-29 12:16:17 +01:00
57cfe9fd43
Level: fixed logic for sending changed blocks to players
...
If there is an empty list of blocks in the changedBlocks array for a chunk, that means that blocks changed the normal way and then were later set the direct way in the same tick. This means that no action needs to be taken on these chunks.
2018-06-29 11:10:31 +01:00
d8824e7ee1
Level: discard changed blocks on chunk replace
...
this could cause issues when plugins replace chunks when blocks in the chunk have been changed on the same tick.
2018-06-29 11:06:33 +01:00
3455d0f3b9
Level: cleaned up some nonsensical code in setChunk()
2018-06-29 10:58:31 +01:00
fc8dc8a497
Merge branch 'release/3.1'
2018-06-24 17:34:57 +01:00
ec2cca04a7
Merge branch 'release/3.0' into release/3.1
2018-06-24 17:34:37 +01:00
6b2250cbce
RCONInstance: terminate session on ECONNRESET errors
2018-06-24 17:32:51 +01:00
8dae497610
back to dev
2018-06-24 17:32:51 +01:00
cade15e2dd
disable dev flag for release
2018-06-24 16:34:19 +01:00
272b76d24c
fix Punch mess
2018-06-24 13:43:52 +01:00
8c672cb7c8
Implemented Sharpness, Fire Aspect and Knockback enchantments
2018-06-24 12:13:54 +01:00
cfee9aa117
Merge branch 'release/3.1'
2018-06-24 12:07:57 +01:00
4d9368f205
Merge branch 'release/3.0' into release/3.1
2018-06-24 12:07:45 +01:00
97c267c70c
Implemented Punch enchantment
2018-06-23 17:40:01 +01:00
85a3c0e7dc
Implemented Flame enchantment
2018-06-23 17:11:20 +01:00
d3e54db146
ExperienceOrb: stop tracking targets if they die while being tracked
2018-06-23 16:41:21 +01:00
0081e30a89
Living: fix knockback condition, take 2
...
onGround doesn't necessarily reflect 0 motion, because something else could change the motion prior to the onGround flag getting updated - for example 2 knockbacks in a row.
2018-06-23 14:30:26 +01:00
2f70a1eefb
Implemented Thorns enchantment ( #2258 )
...
This implementation is rough and can probably be improved to make it extendable, but this works for now and can be improved later.
2018-06-23 13:36:58 +01:00
884ebe632d
Merge branch 'release/3.1'
2018-06-23 13:04:20 +01:00
7ba6e92b6c
Merge branch 'release/3.0' into release/3.1
2018-06-23 13:04:05 +01:00
76174f1920
Explosion: avoid leaving arrows stuck in nonexistent blocks
2018-06-23 13:03:46 +01:00
47c862bc38
Projectile: check for blockhit change on nearby blockupdate
2018-06-23 12:57:13 +01:00
860c20109b
TNT can now be ignited by burning arrows
2018-06-23 12:54:21 +01:00
1c0b49343c
Implemented Infinity enchantment ( #2259 )
2018-06-23 11:44:35 +01:00
814a949580
Implemented Power enchantment
2018-06-23 11:39:39 +01:00
b393f5f17e
Projectile: ensure that damage multiplier gets saved and restored
2018-06-23 10:41:04 +01:00
f1970492c1
Projectile: added API to modify projectile base damage multiplier
...
This adds two new methods:
- Projectile->getBaseDamage()
- Projectile->setBaseDamage()
2018-06-23 10:38:58 +01:00
dd6b5902a6
EmeraldOre: fixed not dropping XP on break
2018-06-22 21:35:58 +01:00
87852f2fe1
EmeraldOre: remove excess indentation
2018-06-22 21:31:22 +01:00
056d24c67d
Add MUTTON as an ID constant
...
fixes crashdump #518862 - Unable to resolve "minecraft:mutton" to a valid item
PC refers to these as just mutton, but PE calls them muttonraw
2018-06-22 19:39:18 +01:00
d67149376d
Merge branch 'release/3.1'
2018-06-22 17:48:09 +01:00
4c9ca53b32
Merge branch 'release/3.0' into release/3.1
2018-06-22 17:47:33 +01:00
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
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
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
78aa1ee22e
Merge branch 'release/3.1'
2018-06-22 13:42:29 +01:00
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
98ac534820
bump version
2018-06-22 13:22:11 +01:00
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
f60b0e5cc7
Server: more dev build warnings
2018-06-22 09:40:33 +01:00
9a6a5e2088
submodule updates
2018-06-22 09:36:07 +01:00
23085bf9b3
Merge branch 'master' of https://github.com/pmmp/pocketmine-mp
2018-06-22 09:14:03 +01:00
0948c65276
Merge branch 'release/3.x'
2018-06-22 09:13:49 +01:00
