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

Fix selecting a block in blocks list in gui marking block as having its props changed, even if the user did not actually change any props. Fixes #469.

Browse Source
This commit is contained in:
UnknownShadow200 2017-07-08 10:21:54 +10:00
parent 7f3f4255ec
commit 23ea437be0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
GUI/PropertyWindow/PropertyWindow.Blocks.cs
View File

@ -82,7 +82,8 @@ namespace MCGalaxy.Gui {
blockPermsOrig = BlockPerms.List[blockID]; blockPermsOrig = BlockPerms.List[blockID];
blockPerms = blockPermsChanged.Find(p => p.BlockID == blockID); blockPerms = blockPermsChanged.Find(p => p.BlockID == blockID);
BlockInitSpecificArrays(); BlockInitSpecificArrays();
blockSupressEvents = true;
BlockProps props = blockPropsChanged[blockID]; BlockProps props = blockPropsChanged[blockID];
blk_cbMsgBlock.Checked = props.IsMessageBlock; blk_cbMsgBlock.Checked = props.IsMessageBlock;
blk_cbPortal.Checked = props.IsPortal; blk_cbPortal.Checked = props.IsPortal;
@ -95,8 +96,7 @@ namespace MCGalaxy.Gui {
blk_cbRails.Checked = props.IsRails; blk_cbRails.Checked = props.IsRails;
blk_cbLava.Checked = props.LavaKills; blk_cbLava.Checked = props.LavaKills;
blk_cbWater.Checked = props.WaterKills; blk_cbWater.Checked = props.WaterKills;
blockSupressEvents = true;
BlockPerms perms = blockPerms != null ? blockPerms : blockPermsOrig; BlockPerms perms = blockPerms != null ? blockPerms : blockPermsOrig;
GuiPerms.SetDefaultIndex(blk_cmbMin, perms.MinRank); GuiPerms.SetDefaultIndex(blk_cmbMin, perms.MinRank);
GuiPerms.SetSpecificPerms(perms.Allowed, blockAllowBoxes); GuiPerms.SetSpecificPerms(perms.Allowed, blockAllowBoxes);
@ -162,48 +162,48 @@ namespace MCGalaxy.Gui {
void blk_cbMsgBlock_CheckedChanged(object sender, EventArgs e) { void blk_cbMsgBlock_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].IsMessageBlock = blk_cbMsgBlock.Checked; blockPropsChanged[blockID].IsMessageBlock = blk_cbMsgBlock.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_cbPortal_CheckedChanged(object sender, EventArgs e) { void blk_cbPortal_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].IsPortal = blk_cbPortal.Checked; blockPropsChanged[blockID].IsPortal = blk_cbPortal.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_cbDeath_CheckedChanged(object sender, EventArgs e) { void blk_cbDeath_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].KillerBlock = blk_cbDeath.Checked; blockPropsChanged[blockID].KillerBlock = blk_cbDeath.Checked;
blk_txtDeath.Enabled = blk_cbDeath.Checked; blk_txtDeath.Enabled = blk_cbDeath.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_txtDeath_TextChanged(object sender, EventArgs e) { void blk_txtDeath_TextChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].DeathMessage = blk_txtDeath.Text; blockPropsChanged[blockID].DeathMessage = blk_txtDeath.Text;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_cbDoor_CheckedChanged(object sender, EventArgs e) { void blk_cbDoor_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].IsDoor = blk_cbDoor.Checked; blockPropsChanged[blockID].IsDoor = blk_cbDoor.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_cbTdoor_CheckedChanged(object sender, EventArgs e) { void blk_cbTdoor_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].IsTDoor = blk_cbTdoor.Checked; blockPropsChanged[blockID].IsTDoor = blk_cbTdoor.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_cbRails_CheckedChanged(object sender, EventArgs e) { void blk_cbRails_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].IsRails = blk_cbRails.Checked; blockPropsChanged[blockID].IsRails = blk_cbRails.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_cbLava_CheckedChanged(object sender, EventArgs e) { void blk_cbLava_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].LavaKills = blk_cbLava.Checked; blockPropsChanged[blockID].LavaKills = blk_cbLava.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
void blk_cbWater_CheckedChanged(object sender, EventArgs e) { void blk_cbWater_CheckedChanged(object sender, EventArgs e) {
blockPropsChanged[blockID].WaterKills = blk_cbWater.Checked; blockPropsChanged[blockID].WaterKills = blk_cbWater.Checked;
blockPropsChanged[blockID].Changed = true; blockPropsChanged[blockID].Changed = !blockSupressEvents;
} }
} }
} }