Skip to content

Commit

Permalink
Formate code
Browse files Browse the repository at this point in the history
  • Loading branch information
@bdfzchen2015
bdfzchen2015 committed Mar 8, 2017
1 parent 5f8ced4 commit 44ba749
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 48 deletions.
22 changes: 11 additions & 11 deletions MWorld.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ public override void PreUpdate()
}
}
}
if(Main.time % 180 < 1)
if (Main.time % 180 < 1)
{
foreach (var player in ServerSideCharacter.XmlData.Data)
{
if (player.Value.prototypePlayer != null)
if (player.Value.PrototypePlayer != null)
{
int playerID = player.Value.prototypePlayer.whoAmI;
int playerID = player.Value.PrototypePlayer.whoAmI;
if (!player.Value.HasPassword)
{
player.Value.ApplyLockBuffs();
Expand All @@ -72,35 +72,35 @@ public override void PreUpdate()
}
if (Main.time % 3600 < 1)
{
ThreadPool.QueueUserWorkItem(do_Save);
ThreadPool.QueueUserWorkItem(Do_Save);
}
foreach(var player in Main.player)
foreach (var player in Main.player)
{
if (player.active && player.GetServerPlayer().enteredRegion == null)
if (player.active && player.GetServerPlayer().EnteredRegion == null)
{
var serverPlayer = player.GetServerPlayer();
RegionInfo region;
if (serverPlayer.InAnyRegion(out region))
{
serverPlayer.enteredRegion = region;
serverPlayer.EnteredRegion = region;
serverPlayer.SendInfo(region.WelcomeInfo());
}
}
else if(player.GetServerPlayer().enteredRegion != null)
else if (player.GetServerPlayer().EnteredRegion != null)
{
var serverPlayer = player.GetServerPlayer();
RegionInfo region;
if (!serverPlayer.InAnyRegion(out region))
{
serverPlayer.SendInfo(serverPlayer.enteredRegion.LeaveInfo());
serverPlayer.enteredRegion = null;
serverPlayer.SendInfo(serverPlayer.EnteredRegion.LeaveInfo());
serverPlayer.EnteredRegion = null;
}
}
}
}
}

private void do_Save(object state)
private void Do_Save(object state)
{
foreach (var player in ServerSideCharacter.XmlData.Data)
{
Expand Down
2 changes: 1 addition & 1 deletion Region/RegionInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class RegionInfo
public ServerPlayer Owner { get; set; }
public List<ServerPlayer> SharedOwner = new List<ServerPlayer>();
public Rectangle Area { get; set; }
public List<RegionPermission> permissions { get; set; }
public List<RegionPermission> Permissions { get; set; }

public RegionInfo(string name, ServerPlayer player, Rectangle rect)
{
Expand Down
2 changes: 1 addition & 1 deletion Region/RegionManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public bool RemoveRegionWithName(string name)
lock (ServerRegions)
{
int index = ServerRegions.FindIndex(region => region.Name == name);
if (index == -1)
if (index != -1)
{
ServerRegions.RemoveAt(index);
foreach (var player in ServerSideCharacter.XmlData.Data)
Expand Down
26 changes: 13 additions & 13 deletions ServerPlayer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ public class ServerPlayer

public Chest bank3 = new Chest(true);

public Player prototypePlayer { get; set; }
public Player PrototypePlayer { get; set; }

public RegionInfo enteredRegion { get; set; }
public RegionInfo EnteredRegion { get; set; }

public List<RegionInfo> ownedregion = new List<RegionInfo>();

Expand Down Expand Up @@ -101,7 +101,7 @@ public ServerPlayer()
public ServerPlayer(Player player)
{
SetupPlayer();
prototypePlayer = player;
PrototypePlayer = player;
}

public void CopyFrom(Player player)
Expand All @@ -123,31 +123,31 @@ public void CopyFrom(Player player)

public void ApplyLockBuffs(int time = 180)
{
prototypePlayer.AddBuff(ServerSideCharacter.Instance.BuffType("Locked"), time * 2, false);
prototypePlayer.AddBuff(BuffID.Frozen, time, false);
NetMessage.SendData(MessageID.AddPlayerBuff, prototypePlayer.whoAmI, -1,
"", prototypePlayer.whoAmI,
PrototypePlayer.AddBuff(ServerSideCharacter.Instance.BuffType("Locked"), time * 2, false);
PrototypePlayer.AddBuff(BuffID.Frozen, time, false);
NetMessage.SendData(MessageID.AddPlayerBuff, PrototypePlayer.whoAmI, -1,
"", PrototypePlayer.whoAmI,
ServerSideCharacter.Instance.BuffType("Locked"), time * 2, 0f, 0, 0, 0);
NetMessage.SendData(MessageID.AddPlayerBuff, prototypePlayer.whoAmI, -1,
"", prototypePlayer.whoAmI,
NetMessage.SendData(MessageID.AddPlayerBuff, PrototypePlayer.whoAmI, -1,
"", PrototypePlayer.whoAmI,
BuffID.Frozen, time, 0f, 0, 0, 0);
}

public void SendSuccessInfo(string msg)
{
NetMessage.SendData(MessageID.ChatText, prototypePlayer.whoAmI, -1,
NetMessage.SendData(MessageID.ChatText, PrototypePlayer.whoAmI, -1,
msg,
255, 50, 255, 50);
}
public void SendInfo(string msg)
{
NetMessage.SendData(MessageID.ChatText, prototypePlayer.whoAmI, -1,
NetMessage.SendData(MessageID.ChatText, PrototypePlayer.whoAmI, -1,
msg,
255, 255, 255, 0);
}
public void SendErrorInfo(string msg)
{
NetMessage.SendData(MessageID.ChatText, prototypePlayer.whoAmI, -1,
NetMessage.SendData(MessageID.ChatText, PrototypePlayer.whoAmI, -1,
msg,
255, 255, 20, 0);
}
Expand Down Expand Up @@ -199,7 +199,7 @@ public bool InAnyRegion(out RegionInfo region)
{
Rectangle worldArea = new Rectangle(reg.Area.X * 16, reg.Area.Y * 16,
reg.Area.Width * 16, reg.Area.Height * 16);
if (worldArea.Intersects(prototypePlayer.Hitbox))
if (worldArea.Intersects(PrototypePlayer.Hitbox))
{
region = reg;
return true;
Expand Down
38 changes: 16 additions & 22 deletions ServerSideCharacter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
#define DEBUGMODE
using Microsoft.Xna.Framework;
using ServerSideCharacter.GroupManage;
using ServerSideCharacter.Region;
using ServerSideCharacter.ServerCommand;
using ServerSideCharacter.XMLHelper;
using System;

using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Text;
using System.Threading;
using Terraria;
using Terraria.DataStructures;
using Terraria.ID;
using Terraria.ModLoader;
using System.IO;
using System.Xml;
using Terraria.IO;
using Terraria.Localization;
using Terraria.DataStructures;
using ServerSideCharacter.XMLHelper;
using System.Text;
using System.Linq;
using System.Threading;
using System.Collections.Generic;
using System.Collections.Concurrent;
using System.Diagnostics.CodeAnalysis;
using ServerSideCharacter.ServerCommand;
using ServerSideCharacter.Plugin;
using ServerSideCharacter.GroupManage;
using Microsoft.Xna.Framework;
using Terraria.GameContent.UI.Chat;
using ServerSideCharacter.Region;
using Terraria.ModLoader;

namespace ServerSideCharacter
{
Expand Down Expand Up @@ -95,7 +89,7 @@ public override bool HijackGetData(ref byte messageType, ref BinaryReader reader
{
//创建新的玩家数据
ServerPlayer serverPlayer = ServerPlayer.CreateNewPlayer(Main.player[playerNumber]);
serverPlayer.prototypePlayer = Main.player[playerNumber];
serverPlayer.PrototypePlayer = Main.player[playerNumber];
XmlData.Data.Add(Main.player[playerNumber].name, serverPlayer);
}
catch (Exception ex)
Expand Down Expand Up @@ -241,7 +235,7 @@ private static void SyncOnePlayer(int plr, int toWho, int fromWho)
player.miscEquips.CopyTo(Main.player[plr].miscEquips, 0);
player.miscDye.CopyTo(Main.player[plr].miscDyes, 0);
Main.player[plr].trashItem = new Item();
player.prototypePlayer = Main.player[plr];
player.PrototypePlayer = Main.player[plr];
if (toWho == -1)
{
player.IsLogin = false;
Expand Down Expand Up @@ -637,7 +631,7 @@ public override void HandlePacket(BinaryReader reader, int whoAmI)
sb.AppendLine("Player ID Name Hash Permission Group LifeMax");
foreach (var pla in XmlData.Data)
{
Player player1 = pla.Value.prototypePlayer;
Player player1 = pla.Value.PrototypePlayer;
string line = string.Concat(
player1 != null && player1.active ? player1.whoAmI.ToString() : "N/A",
" ",
Expand Down Expand Up @@ -822,7 +816,7 @@ public override void HandlePacket(BinaryReader reader, int whoAmI)
if (!player.IsLogin || target == plr) return;
if (player.PermissionGroup.HasPermission("tp"))
{
if (targetPlayer.prototypePlayer != null && targetPlayer.prototypePlayer.active)
if (targetPlayer.PrototypePlayer != null && targetPlayer.PrototypePlayer.active)
{
p.Teleport(Main.player[target].position);
MessageSender.SendTeleport(plr, Main.player[target].position);
Expand Down

0 comments on commit 44ba749

Please sign in to comment.