AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 20:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #815 from Fam0r/master

Browse Source 
Make BlockPermissions affect gas blocks better
This commit is contained in:
UnknownShadow200 2021-04-02 14:07:44 +11:00 committed by GitHub
commit ebbff5a35a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Input.c
View File

@ -738,6 +738,10 @@ void InputHandler_PlaceBlock(void) {
if (Game_CanPick(old) || !Blocks.CanPlace[block]) return; if (Game_CanPick(old) || !Blocks.CanPlace[block]) return;
/* air-ish blocks can only replace over other air-ish blocks */ /* air-ish blocks can only replace over other air-ish blocks */
if (Blocks.Draw[block] == DRAW_GAS && Blocks.Draw[old] != DRAW_GAS) return; if (Blocks.Draw[block] == DRAW_GAS && Blocks.Draw[old] != DRAW_GAS) return;
/* undeletable gas blocks can't be replaced with other blocks */
if (Blocks.Collide[old] == COLLIDE_GAS && !Blocks.CanDelete[old]) return;
if (!CheckIsFree(block)) return; if (!CheckIsFree(block)) return;
Game_ChangeBlock(pos.X, pos.Y, pos.Z, block); Game_ChangeBlock(pos.X, pos.Y, pos.Z, block);

1
src/Server.c
View File

@ -296,7 +296,6 @@ static void MPConnection_BeginConnect(void) {
String_InitArray(title, titleBuffer); String_InitArray(title, titleBuffer);
/* Default block permissions (in case server supports SetBlockPermissions but doesn't send) */ /* Default block permissions (in case server supports SetBlockPermissions but doesn't send) */
Blocks.CanPlace[BLOCK_AIR] = false; Blocks.CanDelete[BLOCK_AIR] = false;
Blocks.CanPlace[BLOCK_LAVA] = false; Blocks.CanDelete[BLOCK_LAVA] = false; Blocks.CanPlace[BLOCK_LAVA] = false; Blocks.CanDelete[BLOCK_LAVA] = false;
Blocks.CanPlace[BLOCK_WATER] = false; Blocks.CanDelete[BLOCK_WATER] = false; Blocks.CanPlace[BLOCK_WATER] = false; Blocks.CanDelete[BLOCK_WATER] = false;
Blocks.CanPlace[BLOCK_STILL_LAVA] = false; Blocks.CanDelete[BLOCK_STILL_LAVA] = false; Blocks.CanPlace[BLOCK_STILL_LAVA] = false; Blocks.CanDelete[BLOCK_STILL_LAVA] = false;