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

Show a message when you can't place/delete a block due to not agreeing to /rules

Browse Source
This commit is contained in:
UnknownShadow200 2017-07-09 23:41:20 +10:00
parent c5b642f1e1
commit de66bfa7d7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,26 +14,26 @@ permissions and limitations under the Licenses.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using MCGalaxy.Blocks; using MCGalaxy.Blocks;
using MCGalaxy.Blocks.Physics; using MCGalaxy.Blocks.Physics;
using MCGalaxy.DB;
using MCGalaxy.Commands; using MCGalaxy.Commands;
using MCGalaxy.Commands.Chatting; using MCGalaxy.Commands.Chatting;
using MCGalaxy.DB;
using MCGalaxy.Events; using MCGalaxy.Events;
using MCGalaxy.Games; using MCGalaxy.Games;
using MCGalaxy.Maths;
using MCGalaxy.Network; using MCGalaxy.Network;
using MCGalaxy.SQL; using MCGalaxy.SQL;
using MCGalaxy.Maths;
using MCGalaxy.Util; using MCGalaxy.Util;
namespace MCGalaxy { namespace MCGalaxy {
public partial class Player : IDisposable { public partial class Player : IDisposable {
bool removedFromPending = false; bool removedFromPending = false;
const string mustAgreeMsg = "You must read /rules then agree to them with /agree!";
internal void RemoveFromPending() { internal void RemoveFromPending() {
if (removedFromPending) return; if (removedFromPending) return;
removedFromPending = true; removedFromPending = true;
@ -56,9 +56,13 @@ namespace MCGalaxy {
ExtBlock old = level.GetBlock(x, y, z); ExtBlock old = level.GetBlock(x, y, z);
if (old.IsInvalid) return; if (old.IsInvalid) return;
if (jailed || !agreed || !canBuild) { RevertBlock(x, y, z); return; } if (jailed || !canBuild) { RevertBlock(x, y, z); return; }
if (level.IsMuseum && Blockchange == null) return; if (!agreed) {
SendMessage(mustAgreeMsg);
RevertBlock(x, y, z); return;
}
if (level.IsMuseum && Blockchange == null) return;
if (action > 1) { if (action > 1) {
const string msg = "Unknown block action!"; const string msg = "Unknown block action!";
Leave(msg, msg, true); return; Leave(msg, msg, true); return;
@ -658,7 +662,7 @@ namespace MCGalaxy {
bool CheckCommand(string cmd) { bool CheckCommand(string cmd) {
if (cmd == "") { SendMessage("No command entered."); return false; } if (cmd == "") { SendMessage("No command entered."); return false; }
if (ServerConfig.AgreeToRulesOnEntry && !agreed && !(cmd == "agree" || cmd == "rules" || cmd == "disagree")) { if (ServerConfig.AgreeToRulesOnEntry && !agreed && !(cmd == "agree" || cmd == "rules" || cmd == "disagree")) {
SendMessage("You must read /rules then agree to them with /agree!"); return false; SendMessage(mustAgreeMsg); return false;
} }
if (jailed) { if (jailed) {
SendMessage("You cannot use any commands while jailed."); return false; SendMessage("You cannot use any commands while jailed."); return false;