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

Should not be able to place /portal and /mb in levels you do not have perbuild on. (Thanks goodlyay)

Browse Source
This commit is contained in:
UnknownShadow200 2016-02-26 09:39:08 +11:00
parent 489ba757b1
commit 5665ae3715
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Commands/CmdOverseer.cs
View File

@ -24,7 +24,7 @@ namespace MCGalaxy.Commands
{
public override string name { get { return "overseer"; } }
public override string shortcut { get { return "os"; } }
public override string type { get { return "commands"; } }
public override string type { get { return CommandTypes.Moderation; } }
public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Builder; } }
public CmdOverseer() { }

40
Commands/building/CmdMessageBlock.cs
View File

@ -70,29 +70,37 @@ namespace MCGalaxy.Commands {
message.StartsWith(cmd + " ", StringComparison.OrdinalIgnoreCase);
}
public void Blockchange1(Player p, ushort x, ushort y, ushort z, byte type, byte extType) {
void Blockchange1(Player p, ushort x, ushort y, ushort z, byte type, byte extType) {
p.ClearBlockchange();
CatchPos cpos = (CatchPos)p.blockchangeObject;
cpos.message = cpos.message.Replace("'", "\\'");
cpos.message = Colors.EscapeColors(cpos.message);
//safe against SQL injections because no user input is given here
DataTable Messages = Database.fillData("SELECT * FROM `Messages" + p.level.name + "` WHERE X=" + (int)x + " AND Y=" + (int)y + " AND Z=" + (int)z);
Database.AddParams("@Message", cpos.message);
if (Messages.Rows.Count == 0)
Database.executeQuery("INSERT INTO `Messages" + p.level.name + "` (X, Y, Z, Message) VALUES (" + (int)x + ", " + (int)y + ", " + (int)z + ", @Message)");
else
Database.executeQuery("UPDATE `Messages" + p.level.name + "` SET Message=@Message WHERE X=" + (int)x + " AND Y=" + (int)y + " AND Z=" + (int)z);
Messages.Dispose();
Player.SendMessage(p, "Message block placed.");
p.level.Blockchange(p, x, y, z, cpos.type);
p.SendBlockchange(x, y, z, cpos.type);
if (p.level.GetTile(x, y, z) == cpos.type) {
p.SendBlockchange(x, y, z, cpos.type);
UpdateDatabase(p, cpos, x, y, z);
Player.SendMessage(p, "Message block created.");
} else {
Player.SendMessage(p, "Failed to create a message block.");
}
if (p.staticCommands)
p.Blockchange += new Player.BlockchangeEventHandler(Blockchange1);
}
void UpdateDatabase(Player p, CatchPos cpos, ushort x, ushort y, ushort z) {
cpos.message = cpos.message.Replace("'", "\\'");
cpos.message = Colors.EscapeColors(cpos.message);
//safe against SQL injections because no user input is given here
DataTable Messages = Database.fillData("SELECT * FROM `Messages" + p.level.name + "` WHERE X=" + x + " AND Y=" + y + " AND Z=" + z);
Database.AddParams("@Message", cpos.message);
if (Messages.Rows.Count == 0)
Database.executeQuery("INSERT INTO `Messages" + p.level.name + "` (X, Y, Z, Message) VALUES (" + x + ", " + y + ", " + z + ", @Message)");
else
Database.executeQuery("UPDATE `Messages" + p.level.name + "` SET Message=@Message WHERE X=" + x + " AND Y=" + y + " AND Z=" + z);
Messages.Dispose();
}
struct CatchPos { public string message; public byte type; }

9
Commands/building/CmdPortal.cs
View File

@ -57,12 +57,15 @@ namespace MCGalaxy.Commands {
p.ClearBlockchange();
data.entries = new List<PortalPos>();
p.blockchangeObject = data;
p.Blockchange += new Player.BlockchangeEventHandler(EntryChange);
p.Blockchange += EntryChange;
}
void EntryChange(Player p, ushort x, ushort y, ushort z, byte type, byte extType) {
void EntryChange(Player p, ushort x, ushort y, ushort z, byte type, byte extType) {
PortalData bp = (PortalData)p.blockchangeObject;
if (!p.level.CheckAffectPermissions(p, x, y, z, type, extType)) {
p.RevertBlock(x, y, z); return;
}
p.ClearBlockchange();
PortalData bp = (PortalData)p.blockchangeObject;
if (bp.Multi && type == Block.red && bp.entries.Count > 0) { ExitChange(p, x, y, z, type, extType); return; }