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

ZS: Pillaring sprite blocks, or when pillaring in water/lava, should not count towards auto-pillar kick.

Browse Source
This commit is contained in:
UnknownShadow200 2016-09-14 08:48:58 +10:00
parent f0693de778
commit 882ee57c49
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Games/IGame.cs
View File

@ -26,7 +26,7 @@ namespace MCGalaxy.Games {
/// <summary> Returns whether this game handed the player manually placing a block. </summary>
public virtual bool HandlesManualChange(Player p, ushort x, ushort y, ushort z,
byte action, byte tile, byte b) {
byte action, byte block, byte old) {
return false;
}

22
Games/ZombieSurvival/ZombieGame.Game.cs
View File

@ -26,26 +26,28 @@ namespace MCGalaxy.Games {
public override bool TeleportAllowed { get { return !RoundInProgress; } }
public override bool HandlesManualChange(Player p, ushort x, ushort y, ushort z,
byte action, byte tile, byte b) {
byte action, byte block, byte old) {
if (!Running || (p.level == null || !p.level.name.CaselessEq(CurLevelName))) return false;
if (CurLevel.BuildType == BuildType.NoModify) {
p.RevertBlock(x, y, z); return true;
} else if (CurLevel.BuildType == BuildType.ModifyOnly
&& p.level.GetTile(x, y, z) == Block.op_air) {
}
if (CurLevel.BuildType == BuildType.ModifyOnly && Block.Props[old].OPBlock) {
p.RevertBlock(x, y, z); return true;
}
if (action == 1 && !CurLevel.Pillaring && !p.Game.Referee) {
if (p.Game.LastY == y - 1 && p.Game.LastX == x && p.Game.LastZ == z ) {
if (NotPillaring(block, old)) {
p.Game.BlocksStacked = 0;
} else if (p.Game.LastY == y - 1 && p.Game.LastX == x && p.Game.LastZ == z ) {
p.Game.BlocksStacked++;
} else {
p.Game.BlocksStacked = 0;
}
if (p.Game.BlocksStacked == 2 ) {
if (p.Game.BlocksStacked == 2) {
p.SendMessage("You are pillaring! Stop before you get kicked!");
}
if (p.Game.BlocksStacked == 4 ) {
if (p.Game.BlocksStacked == 4) {
p.Kick("No pillaring allowed!"); return true;
}
}
@ -66,6 +68,14 @@ namespace MCGalaxy.Games {
return false;
}
static bool NotPillaring(byte block, byte old) {
if (block == Block.shrub) return true;
if (block >= Block.yellowflower && block <= Block.redmushroom) return true;
old = Block.Convert(old);
return old >= Block.water && block <= Block.lavastill;
}
public override bool HandlesMovement(Player p, ushort x, ushort y, ushort z,
byte rotX, byte rotY) {
if (!Running || (p.level == null || !p.level.name.CaselessEq(CurLevelName))) return false;