mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-07 12:18:46 +00:00
Merge branch 'stable'
This commit is contained in:
commit
2cab22fd38
@ -68,6 +68,6 @@ file_put_contents($versionInfoPath, $mod = preg_replace(
|
|||||||
));
|
));
|
||||||
system('git add "' . $versionInfoPath . '"');
|
system('git add "' . $versionInfoPath . '"');
|
||||||
system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"');
|
system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"');
|
||||||
echo "pushing changes in 10 seconds";
|
echo "pushing changes in 10 seconds\n";
|
||||||
sleep(10);
|
sleep(10);
|
||||||
system('git push origin HEAD ' . BASE_VERSION);
|
system('git push origin HEAD ' . BASE_VERSION);
|
||||||
|
@ -55,3 +55,11 @@ This changelog **does not account for protocol changes**. If your plugin uses th
|
|||||||
- Fixed sluggish playercount updating on MOTD.
|
- Fixed sluggish playercount updating on MOTD.
|
||||||
- Added new MultiRecipe UUIDs.
|
- Added new MultiRecipe UUIDs.
|
||||||
- Added an extra field to `StartGamePacket` to resolve minor incompatibility issues on different 1.11.x patch versions.
|
- Added an extra field to `StartGamePacket` to resolve minor incompatibility issues on different 1.11.x patch versions.
|
||||||
|
|
||||||
|
# 3.8.6
|
||||||
|
- Fixed `Entity->isNameTagAlwaysVisible()` not working.
|
||||||
|
- Log messages are now cleaned of invalid UTF-8 sequences before emitting them.
|
||||||
|
- Fixed negative integers being considered as strings for world seeds.
|
||||||
|
- Fixed out-of-bounds access on invalid inventory data in player data saves.
|
||||||
|
- Fixed crash when custom liquids have flow decays which aren't factors of 4.
|
||||||
|
- Fixed `Entity->noDamageTicks` not working when the entity had no previous damage cause.
|
||||||
|
@ -34,6 +34,7 @@ use pocketmine\world\sound\FizzSound;
|
|||||||
use pocketmine\world\sound\Sound;
|
use pocketmine\world\sound\Sound;
|
||||||
use pocketmine\world\World;
|
use pocketmine\world\World;
|
||||||
use function array_fill;
|
use function array_fill;
|
||||||
|
use function intdiv;
|
||||||
use function lcg_value;
|
use function lcg_value;
|
||||||
use function min;
|
use function min;
|
||||||
|
|
||||||
@ -405,7 +406,7 @@ abstract class Liquid extends Transparent{
|
|||||||
*/
|
*/
|
||||||
private function getOptimalFlowDirections() : array{
|
private function getOptimalFlowDirections() : array{
|
||||||
$flowCost = array_fill(0, 4, 1000);
|
$flowCost = array_fill(0, 4, 1000);
|
||||||
$maxCost = 4 / $this->getFlowDecayPerBlock();
|
$maxCost = intdiv(4, $this->getFlowDecayPerBlock());
|
||||||
for($j = 0; $j < 4; ++$j){
|
for($j = 0; $j < 4; ++$j){
|
||||||
$x = $this->x;
|
$x = $this->x;
|
||||||
$y = $this->y;
|
$y = $this->y;
|
||||||
|
@ -389,7 +389,9 @@ abstract class Living extends Entity{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function attack(EntityDamageEvent $source) : void{
|
public function attack(EntityDamageEvent $source) : void{
|
||||||
if($this->attackTime > 0 or $this->noDamageTicks > 0){
|
if($this->noDamageTicks > 0){
|
||||||
|
$source->setCancelled();
|
||||||
|
}elseif($this->attackTime > 0){
|
||||||
$lastCause = $this->getLastDamageCause();
|
$lastCause = $this->getLastDamageCause();
|
||||||
if($lastCause !== null and $lastCause->getBaseDamage() >= $source->getBaseDamage()){
|
if($lastCause !== null and $lastCause->getBaseDamage() >= $source->getBaseDamage()){
|
||||||
$source->setCancelled();
|
$source->setCancelled();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user