Banning players, networkevent refactoring, wire syncing bugfixes, wrenches can be used as a melee weapon, proper error message for invalid IPs, drawing held items in correct position, fixed client crashing if sending a chatmessage while connection is lost

2015-10-22 01:04:42 +03:00
parent 313d16d886
commit 51e68f0949
28 changed files with 520 additions and 154 deletions
@@ -0,0 +1,144 @@
+using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Barotrauma.Networking
+{
+    class BanList
+    {
+        const string SavePath = "Data/bannedplayers.xml";
+
+        private List<BannedPlayer> bannedPlayers;
+
+        private GUIFrame banFrame;
+
+        public GUIFrame BanFrame
+        {
+            get { return banFrame; }
+        }
+
+        public BanList()
+        {
+            bannedPlayers = new List<BannedPlayer>();
+
+            if (File.Exists(SavePath))
+            {
+                string[] lines;
+                try
+                {
+                    lines = File.ReadAllLines(SavePath);
+                }
+                catch (Exception e) 
+                {
+                    DebugConsole.ThrowError("Failed to open the list of banned players in "+SavePath, e);
+                    return;
+                }
+                
+                foreach (string line in lines)
+                {
+                    string[] separatedLine = line.Split(',');
+                    if (separatedLine.Length != 2) continue;
+
+                    bannedPlayers.Add(new BannedPlayer(separatedLine[0],separatedLine[1]));
+                }
+            }
+        }
+
+        public void BanPlayer(string name, string ip)
+        {
+            if (bannedPlayers.FirstOrDefault(bp => bp.IP == ip)!=null) return;
+
+            bannedPlayers.Add(new BannedPlayer(name,ip));
+        }
+
+        public bool IsBanned(string IP)
+        {
+            return bannedPlayers.FirstOrDefault(bp => bp.IP == IP)!=null;
+        }
+
+        private GUIFrame CreateBanFrame()
+        {
+            banFrame = new GUIFrame(new Rectangle(0,0,GameMain.GraphicsWidth,GameMain.GraphicsHeight), Color.Black*0.3f);
+
+            GUIFrame innerFrame = new GUIFrame(new Rectangle(0,0,300,300), null, Alignment.Center, GUI.Style, banFrame);
+
+            new GUITextBlock(new Rectangle(0, 0, 0, 30), "Banned IPs:", GUI.Style, Alignment.Left, Alignment.Left, innerFrame, false, GUI.LargeFont);
+            var banList = new GUIListBox(new Rectangle(0, 30, 200, 0), GUI.Style, innerFrame);
+
+            foreach (BannedPlayer bannedPlayer in bannedPlayers)
+            {
+                GUITextBlock textBlock = new GUITextBlock(
+                    new Rectangle(0, 0, 0, 25),
+                    bannedPlayer.IP+" ("+bannedPlayer.Name+")",
+                    GUI.Style,
+                    Alignment.Left, Alignment.Left, banList);
+                textBlock.Padding = new Vector4(10.0f, 0.0f, 0.0f, 0.0f);
+                textBlock.UserData = banList;
+
+                var removeButton = new GUIButton(new Rectangle(0,0,100,20), "Remove", Alignment.Right, GUI.Style, textBlock);
+                removeButton.UserData = bannedPlayer;
+                removeButton.OnClicked = RemoveBan;
+            }
+
+            var closeButton = new GUIButton(new Rectangle(0,0,100,20), "Close", Alignment.BottomRight, GUI.Style, innerFrame);
+            closeButton.OnClicked = CloseFrame;
+
+
+            return banFrame;
+        }
+
+        private bool RemoveBan(GUIButton button, object obj)
+        {
+            BannedPlayer banned = obj as BannedPlayer;
+            if (banned == null) return false;
+
+            bannedPlayers.Remove(banned);
+
+            CreateBanFrame();
+
+            return true;
+        }
+
+        private bool CloseFrame(GUIButton button, object obj)
+        {
+            banFrame = null;
+
+            return true;
+        }
+
+        public void Save()
+        {
+            List<string> lines = new List<string>();
+
+            foreach (BannedPlayer banned in bannedPlayers)
+            {
+                lines.Add(banned.Name + "," + banned.IP);
+            }
+
+            try
+            {
+                File.WriteAllLines(SavePath, lines);
+            }
+            catch (Exception e)
+            {
+                DebugConsole.ThrowError("Saving the list of banned players to "+SavePath+" failed", e);
+            }
+        }
+
+    }    
+    
+    class BannedPlayer
+    {
+        public string Name;
+        public string IP;
+
+        public BannedPlayer(string name, string ip)
+        {
+            this.Name = name;
+            this.IP = ip;
+        }
+    }
+}