From ac8342a48025692e3a69ddee03d03797de4d4c61 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 5 Aug 2020 14:52:47 +1000 Subject: [PATCH] Fix block permissions not resetting on disconect (Thanks cybertoon) --- src/Block.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Block.c b/src/Block.c index b450a9347..17f95f6e4 100644 --- a/src/Block.c +++ b/src/Block.c @@ -682,20 +682,12 @@ static void OnReset(void) { } Block_UpdateAllCulling(); Block_RecalculateAllSpriteBB(); -} -static void OnAtlasChanged(void* obj) { Block_RecalculateAllSpriteBB(); } -static void OnInit(void) { - int block; for (block = BLOCK_AIR; block < BLOCK_COUNT; block++) { - Blocks.CanPlace[block] = true; + Blocks.CanPlace[block] = true; Blocks.CanDelete[block] = true; } - AutoRotate_Enabled = true; - OnReset(); - Event_Register_(&TextureEvents.AtlasChanged, NULL, OnAtlasChanged); - Blocks.CanPlace[BLOCK_AIR] = false; Blocks.CanDelete[BLOCK_AIR] = false; Blocks.CanPlace[BLOCK_LAVA] = false; Blocks.CanDelete[BLOCK_LAVA] = false; Blocks.CanPlace[BLOCK_WATER] = false; Blocks.CanDelete[BLOCK_WATER] = false; @@ -704,6 +696,13 @@ static void OnInit(void) { Blocks.CanPlace[BLOCK_BEDROCK] = false; Blocks.CanDelete[BLOCK_BEDROCK] = false; } +static void OnAtlasChanged(void* obj) { Block_RecalculateAllSpriteBB(); } +static void OnInit(void) { + AutoRotate_Enabled = true; + Event_Register_(&TextureEvents.AtlasChanged, NULL, OnAtlasChanged); + OnReset(); +} + struct IGameComponent Blocks_Component = { OnInit, /* Init */ NULL, /* Free */