diff --git a/Blocks/Block.Permissions.cs b/Blocks/Block.Permissions.cs
index f78f37644..abcaf687c 100644
--- a/Blocks/Block.Permissions.cs
+++ b/Blocks/Block.Permissions.cs
@@ -337,7 +337,7 @@ namespace MCGalaxy
w.WriteLine("# If someone has royally screwed up the ranks, just delete this file and let the server restart");
w.WriteLine("# Allowed ranks: " + Group.concatList(false, false, true));
w.WriteLine("# Disallow and allow can be left empty, just make sure there's 2 spaces between the colons");
- w.WriteLine("# This works entirely on permission values, not names. Do not enter a rank name. Use it's permission value");
+ w.WriteLine("# This works entirely on permission values, not names. Do not enter a rank name. Use its permission value");
w.WriteLine("# BlockName : LowestRank : Disallow : Allow");
w.WriteLine("# lava : 60 : 80,67 : 40,41,55");
w.WriteLine("");
diff --git a/Commands/other/CmdLoginMessage.cs b/Commands/Chat/CmdLoginMessage.cs
similarity index 97%
rename from Commands/other/CmdLoginMessage.cs
rename to Commands/Chat/CmdLoginMessage.cs
index 7eaedb119..2aa46ae0e 100644
--- a/Commands/other/CmdLoginMessage.cs
+++ b/Commands/Chat/CmdLoginMessage.cs
@@ -25,7 +25,7 @@ namespace MCGalaxy.Commands {
public override string name { get { return "loginmessage"; } }
public override string shortcut { get { return "loginmsg"; } }
- public override string type { get { return CommandTypes.Other; } }
+ public override string type { get { return CommandTypes.Chat; } }
public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Operator; } }
public CmdLoginMessage() { }
diff --git a/Commands/other/CmdLogoutMessage.cs b/Commands/Chat/CmdLogoutMessage.cs
similarity index 97%
rename from Commands/other/CmdLogoutMessage.cs
rename to Commands/Chat/CmdLogoutMessage.cs
index 572de34ee..b2dd9b798 100644
--- a/Commands/other/CmdLogoutMessage.cs
+++ b/Commands/Chat/CmdLogoutMessage.cs
@@ -25,7 +25,7 @@ namespace MCGalaxy.Commands {
public override string name { get { return "logoutmessage"; } }
public override string shortcut { get { return "logoutmsg"; } }
- public override string type { get { return CommandTypes.Other; } }
+ public override string type { get { return CommandTypes.Chat; } }
public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Operator; } }
public CmdLogoutMessage() { }
diff --git a/Commands/Moderation/CmdJail.cs b/Commands/Moderation/CmdJail.cs
index 41d26dd13..e5c9c04df 100644
--- a/Commands/Moderation/CmdJail.cs
+++ b/Commands/Moderation/CmdJail.cs
@@ -59,7 +59,7 @@ namespace MCGalaxy.Commands
Player.Message(p, "You freed " + who.name + " from jail");
Player.SendChatFrom(who, who.ColoredName + " %Swas &afreed %Sfrom jail", false);
}
- Server.jailed.Save();
+ Server.jailed.Save(true);
}
public override void Help(Player p) {
diff --git a/Commands/other/CmdReview.cs b/Commands/Moderation/CmdReview.cs
similarity index 97%
rename from Commands/other/CmdReview.cs
rename to Commands/Moderation/CmdReview.cs
index 899c0de7c..970d10e14 100644
--- a/Commands/other/CmdReview.cs
+++ b/Commands/Moderation/CmdReview.cs
@@ -26,7 +26,7 @@ namespace MCGalaxy.Commands
{
public override string name { get { return "review"; } }
public override string shortcut { get { return "rvw"; } }
- public override string type { get { return CommandTypes.Other; } }
+ public override string type { get { return CommandTypes.Moderation; } }
public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Guest; } }
public CmdReview() { }
diff --git a/Commands/other/CmdMain.cs b/Commands/World/CmdMain.cs
similarity index 97%
rename from Commands/other/CmdMain.cs
rename to Commands/World/CmdMain.cs
index b677606ab..635b9e41c 100644
--- a/Commands/other/CmdMain.cs
+++ b/Commands/World/CmdMain.cs
@@ -20,7 +20,7 @@ namespace MCGalaxy.Commands {
public override string name { get { return "main"; } }
public override string shortcut { get { return "h"; } }
- public override string type { get { return CommandTypes.Other; } }
+ public override string type { get { return CommandTypes.World; } }
public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Banned; } }
public override CommandPerm[] AdditionalPerms {
diff --git a/Database/Backup.cs b/Database/Backup.cs
index 223509434..c7f4d6bdc 100644
--- a/Database/Backup.cs
+++ b/Database/Backup.cs
@@ -115,7 +115,7 @@ namespace MCGalaxy.SQL {
}
}
sql.WriteLine();
- using (DataTable tableRowData = Database.fillData("SELECT * FROM " + tableName))
+ using (DataTable tableRowData = Database.fillData("SELECT * FROM `" + tableName + "`"))
{
if (tableRowData.Rows.Count > 0)
{
diff --git a/MCGalaxy_.csproj b/MCGalaxy_.csproj
index 1da479fba..66708e362 100644
--- a/MCGalaxy_.csproj
+++ b/MCGalaxy_.csproj
@@ -171,6 +171,8 @@
+
+
@@ -303,6 +305,7 @@
+
@@ -334,15 +337,11 @@
-
-
-
-
@@ -378,6 +377,7 @@
+
diff --git a/Network/Player.Networking.cs b/Network/Player.Networking.cs
index c81d4a91f..8ac5a74c3 100644
--- a/Network/Player.Networking.cs
+++ b/Network/Player.Networking.cs
@@ -389,8 +389,10 @@ namespace MCGalaxy {
if ( OnSendMap != null )
OnSendMap(this, buffer);
- if (!level.guns)
+ if (!level.guns && aiming) {
aiming = false;
+ ClearBlockchange();
+ }
} catch( Exception ex ) {
success = false;
PlayerActions.ChangeMap(this, Server.mainLevel.name);
diff --git a/Player/PlayerExtList.cs b/Player/PlayerExtList.cs
index 37efc0f4d..24c78f77f 100644
--- a/Player/PlayerExtList.cs
+++ b/Player/PlayerExtList.cs
@@ -59,17 +59,14 @@ namespace MCGalaxy {
return players.Count;
} }
- public void Save() { Save(path, true); }
-
- public void Save(string path, bool console) {
+ public void Save(bool console = false) {
using (StreamWriter w = File.CreateText(path)) {
lock (locker) {
foreach (string line in lines)
w.WriteLine(line);
}
}
- if (console)
- Server.s.Log("SAVED: " + path);
+ if (console) Server.s.Log("SAVED: " + path);
}
public static PlayerExtList Load(string path) {