AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 04:32:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix case where painting over white, and having white bound to door_white, would not echo back a white block.

Browse Source
This commit is contained in:
UnknownShadow200 2017-03-05 15:08:18 +11:00
parent 836d90c443
commit 17c31d28c8
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MCGalaxy/Blocks/Behaviour/DeleteBehaviour.cs
View File

@ -65,7 +65,7 @@ namespace MCGalaxy.Blocks {
internal static void C4Det(Player p, byte block, ushort x, ushort y, ushort z) {
C4Physics.BlowUp(new ushort[] { x, y, z }, p.level);
p.ChangeBlock(x, y, z, Block.air, 0); // if block updated, return false so we add to blockdb
p.ChangeBlock(x, y, z, Block.air, 0);
}
internal static void RevertDoor(Player p, byte block, ushort x, ushort y, ushort z) {

31
MCGalaxy/Player/Player.Handlers.cs
View File

@ -120,9 +120,12 @@ namespace MCGalaxy {
if (modeType != 0) block = modeType;
if (doDelete) {
DeleteBlock(oldB, x, y, z, block, extBlock);
bool deleted = DeleteBlock(oldB, x, y, z, block, extBlock);
} else {
PlaceBlock(oldB, x, y, z, block, extBlock);
bool placed = PlaceBlock(oldB, x, y, z, block, extBlock);
// Client always assumes delete succeeds, so we need to echo back the painted over block
// if the block was not changed visually (e.g. they paint white with door_white)
if (!placed && painting) RevertBlock(x, y, z);
}
}
@ -134,35 +137,35 @@ namespace MCGalaxy {
return CommandParser.IsBlockAllowed(this, "place ", block);
}
void DeleteBlock(byte old, ushort x, ushort y, ushort z, byte block, byte extBlock) {
if (deleteMode) { ChangeBlock(x, y, z, Block.air, 0); return; }
bool DeleteBlock(byte old, ushort x, ushort y, ushort z, byte block, byte extBlock) {
if (deleteMode) { return ChangeBlock(x, y, z, Block.air, 0) == 2; }
HandleDelete handler = BlockBehaviour.deleteHandlers[old];
if (handler != null) {
handler(this, old, x, y, z);
} else {
ChangeBlock(x, y, z, Block.air, 0);
return true;
}
return ChangeBlock(x, y, z, Block.air, 0) == 2;
}
void PlaceBlock(byte old, ushort x, ushort y, ushort z, byte block, byte extBlock) {
bool PlaceBlock(byte old, ushort x, ushort y, ushort z, byte block, byte extBlock) {
HandlePlace handler = BlockBehaviour.placeHandlers[block];
if (handler != null) {
handler(this, old, x, y, z);
} else {
ChangeBlock(x, y, z, block, extBlock);
return true;
}
return ChangeBlock(x, y, z, block, extBlock) == 2;
}
/// <summary> Updates the block at the given position, mainly intended for manual changes by the player. </summary>
/// <remarks> Adds to the BlockDB. Also turns block below to grass/dirt depending on light. </remarks>
/// <returns> true if block was updated, false if not. </returns>
public bool ChangeBlock(ushort x, ushort y, ushort z, byte block, byte extBlock) {
/// <returns> Return code from DoBlockchange </returns>
public int ChangeBlock(ushort x, ushort y, ushort z, byte block, byte extBlock) {
byte old = level.GetTile(x, y, z), extOld = 0;
if (old == Block.custom_block) extOld = level.GetExtTile(x, y, z);
int type = level.DoBlockchange(this, x, y, z, block, extBlock);
if (type == 0) return false; // no change performed
if (type == 0) return type; // no change performed
if (type == 2) Player.GlobalBlockchange(level, x, y, z, block, extBlock); // different visually
ushort flags = BlockDBFlags.ManualPlace;
@ -171,7 +174,7 @@ namespace MCGalaxy {
bool autoGrass = level.GrassGrow && (level.physics == 0 || level.physics == 5);
if (!autoGrass) return true;
if (!autoGrass) return type;
byte below = level.GetTile(x, (ushort)(y - 1), z);
if (below == Block.dirt && block == Block.air) {
@ -180,7 +183,7 @@ namespace MCGalaxy {
if (below == Block.grass && !Block.LightPass(block, extBlock, level.CustomBlockDefs)) {
level.Blockchange(this, x, (ushort)(y - 1), z, Block.dirt);
}
return true;
return type;
}