summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author12xx12 <44411062+12xx12@users.noreply.github.com>2020-10-09 22:12:19 +0200
committerGitHub <noreply@github.com>2020-10-09 22:12:19 +0200
commit6fd35be67ac4195d5c976693a71ba2ad9998666a (patch)
treeaa825705ba2624b1f7e2aac4d7e9b3139bf4f31a
parentBeacon now checks for players in surrounding square (#4972) (diff)
downloadcuberite-6fd35be67ac4195d5c976693a71ba2ad9998666a.tar
cuberite-6fd35be67ac4195d5c976693a71ba2ad9998666a.tar.gz
cuberite-6fd35be67ac4195d5c976693a71ba2ad9998666a.tar.bz2
cuberite-6fd35be67ac4195d5c976693a71ba2ad9998666a.tar.lz
cuberite-6fd35be67ac4195d5c976693a71ba2ad9998666a.tar.xz
cuberite-6fd35be67ac4195d5c976693a71ba2ad9998666a.tar.zst
cuberite-6fd35be67ac4195d5c976693a71ba2ad9998666a.zip
-rw-r--r--src/Blocks/BlockIce.h1
-rw-r--r--src/Blocks/BlockMobSpawner.h4
-rw-r--r--src/Blocks/BlockOre.h4
3 files changed, 9 insertions, 0 deletions
diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h
index 8ff6415fb..76b48d04f 100644
--- a/src/Blocks/BlockIce.h
+++ b/src/Blocks/BlockIce.h
@@ -85,6 +85,7 @@ private:
const cEntity * a_Digger
) const override
{
+ UNUSED(a_Digger);
// If there's a solid block or a liquid underneath, convert to water, rather than air
if (a_BlockPos.y <= 0)
{
diff --git a/src/Blocks/BlockMobSpawner.h b/src/Blocks/BlockMobSpawner.h
index 27d3d61de..791a71301 100644
--- a/src/Blocks/BlockMobSpawner.h
+++ b/src/Blocks/BlockMobSpawner.h
@@ -61,6 +61,10 @@ private:
const cEntity * a_Digger
) const override
{
+ if (a_Digger == nullptr)
+ {
+ return;
+ }
if (!a_Digger->IsPlayer())
{
return;
diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h
index 6d6c2a097..db4f4aea4 100644
--- a/src/Blocks/BlockOre.h
+++ b/src/Blocks/BlockOre.h
@@ -71,6 +71,10 @@ private:
const cEntity * a_Digger
) const override
{
+ if (a_Digger == nullptr)
+ {
+ return;
+ }
if (!a_Digger->IsPlayer())
{
return;