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

Move PlayerDB folder creating methods to only be called once on server startup and on nick/login/logout setting methods

Browse Source
This commit is contained in:
UnknownShadow200 2021-09-27 19:34:59 +10:00
parent a79a17777a
commit 5c612be82b
4 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MCGalaxy/Database/PlayerDB.cs
View File

@ -47,26 +47,23 @@ namespace MCGalaxy.DB {
} }
public static void SetNick(string name, string nick) { public static void SetNick(string name, string nick) {
EnsureDirectoriesExist();
using (StreamWriter sw = new StreamWriter("players/" + name + "DB.txt", false)) using (StreamWriter sw = new StreamWriter("players/" + name + "DB.txt", false))
sw.WriteLine("Nick = " + nick); sw.WriteLine("Nick = " + nick);
} }
public static string GetLoginMessage(Player p) { public static string GetLoginMessage(Player p) {
if (!Directory.Exists("text/login"))
Directory.CreateDirectory("text/login");
string path = LoginPath(p.name); string path = LoginPath(p.name);
if (File.Exists(path)) return File.ReadAllText(path); if (File.Exists(path)) return File.ReadAllText(path);
// Unix is case sensitive (older files used correct casing of name)
// Filesystem is case sensitive (older files used correct casing of name)
path = "text/login/" + p.name + ".txt"; path = "text/login/" + p.name + ".txt";
return File.Exists(path) ? File.ReadAllText(path) : "connected"; return File.Exists(path) ? File.ReadAllText(path) : "connected";
} }
public static string GetLogoutMessage(Player p) { public static string GetLogoutMessage(Player p) {
if (p.name == null) return "disconnected"; if (p.name == null) return "disconnected";
if (!Directory.Exists("text/logout"))
Directory.CreateDirectory("text/logout");
string path = LogoutPath(p.name); string path = LogoutPath(p.name);
if (File.Exists(path)) return File.ReadAllText(path); if (File.Exists(path)) return File.ReadAllText(path);
@ -76,6 +73,7 @@ namespace MCGalaxy.DB {
} }
static void SetMessage(string path, string msg) { static void SetMessage(string path, string msg) {
EnsureDirectoriesExist();
if (msg.Length > 0) { if (msg.Length > 0) {
File.WriteAllText(path, msg); File.WriteAllText(path, msg);
} else if (File.Exists(path)) { } else if (File.Exists(path)) {
@ -165,5 +163,15 @@ namespace MCGalaxy.DB {
"WHERE Name LIKE @0 ESCAPE '#' LIMIT 101" + suffix, "WHERE Name LIKE @0 ESCAPE '#' LIMIT 101" + suffix,
"%" + name.Replace("_", "#_") + "%"); "%" + name.Replace("_", "#_") + "%");
} }
public static void EnsureDirectoriesExist() {
if (!Directory.Exists("text/login"))
Directory.CreateDirectory("text/login");
if (!Directory.Exists("text/logout"))
Directory.CreateDirectory("text/logout");
if (!Directory.Exists("players"))
Directory.CreateDirectory("players");
}
} }
} }

52
MCGalaxy/Network/Utils/BufferedBlockSender.cs
View File

@ -19,12 +19,13 @@ using System;
using BlockID = System.UInt16; using BlockID = System.UInt16;
using BlockRaw = System.Byte; using BlockRaw = System.Byte;
namespace MCGalaxy.Network { namespace MCGalaxy.Network
{
/// <summary> Helper class for efficiently sending many block changes. </summary> /// <summary> Helper class for efficiently sending many block changes. </summary>
/// <remarks> Sends block changes as either a single CPE BulkBlockUpdate packet, /// <remarks> Sends block changes as either a single CPE BulkBlockUpdate packet,
/// or 256 SetBlock packets combined as a single byte array to reduce overhead. </remarks> /// or 256 SetBlock packets combined as a single byte array to reduce overhead. </remarks>
public sealed class BufferedBlockSender { public sealed class BufferedBlockSender
{
int[] indices = new int[256]; int[] indices = new int[256];
BlockID[] blocks = new BlockID[256]; BlockID[] blocks = new BlockID[256];
int count = 0; int count = 0;
@ -32,19 +33,19 @@ namespace MCGalaxy.Network {
public Player player; public Player player;
public BufferedBlockSender() { } public BufferedBlockSender() { }
/// <summary> Constructs a bulk sender that will send block changes to all players on that level. </summary> /// <summary> Constructs a bulk sender that will send block changes to all players on that level </summary>
public BufferedBlockSender(Level level) { public BufferedBlockSender(Level level) {
this.level = level; this.level = level;
} }
/// <summary> Constructs a bulk sender that will only send block changes to that player. </summary> /// <summary> Constructs a bulk sender that will only send block changes to that player </summary>
public BufferedBlockSender(Player player) { public BufferedBlockSender(Player player) {
this.player = player; this.player = player;
this.level = player.level; this.level = player.level;
} }
/// <summary> Adds a block change to list of buffered changes. </summary> /// <summary> Adds a block change to list of buffered changes </summary>
/// <remarks> When buffer limit is reached, calls Flush(), resetting buffered list. </remarks> /// <remarks> This method automatically calls Flush() when buffer limit is reached </remarks>
public void Add(int index, BlockID block) { public void Add(int index, BlockID block) {
indices[count] = index; indices[count] = index;
if (Block.IsPhysicsType(block)) { if (Block.IsPhysicsType(block)) {
@ -57,7 +58,7 @@ namespace MCGalaxy.Network {
if (count == 256) Flush(); if (count == 256) Flush();
} }
/// <summary> Sends buffered block changes to target player(s). </summary> /// <summary> Sends buffered block changes to target player(s) </summary>
public void Flush() { public void Flush() {
if (count == 0) return; if (count == 0) return;
@ -67,27 +68,29 @@ namespace MCGalaxy.Network {
} }
void SendLevel() { void SendLevel() {
byte[] bulk = null, normal = null, noBlockDefs = null, classic = null, ext = null, extBulk = null; byte[] bulk = null, normal = null, classic = null, ext = null, extBulk = null;
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player p in players) { foreach (Player p in players)
{
if (p.level != level) continue; if (p.level != level) continue;
byte[] packet = MakePacket(p, ref bulk, ref normal, byte[] packet = MakePacket(p, ref bulk, ref normal,
ref noBlockDefs, ref classic, ref ext, ref extBulk); ref classic, ref ext, ref extBulk);
p.Socket.Send(packet, SendFlags.LowPriority); p.Socket.Send(packet, SendFlags.LowPriority);
} }
} }
void SendPlayer() { void SendPlayer() {
byte[] bulk = null, normal = null, noBlockDefs = null, classic = null, ext = null, extBulk = null; byte[] bulk = null, normal = null,classic = null, ext = null, extBulk = null;
byte[] packet = MakePacket(player, ref bulk, ref normal, byte[] packet = MakePacket(player, ref bulk, ref normal,
ref noBlockDefs, ref classic, ref ext, ref extBulk); ref classic, ref ext, ref extBulk);
player.Socket.Send(packet, SendFlags.LowPriority); player.Socket.Send(packet, SendFlags.LowPriority);
} }
#region Packet construction #region Packet construction
byte[] MakePacket(Player p, ref byte[] bulk, ref byte[] normal, byte[] MakePacket(Player p, ref byte[] bulk, ref byte[] normal,
ref byte[] noBlockDefs, ref byte[] classic, ref byte[] ext, ref byte[] extBulk) { ref byte[] classic, ref byte[] ext, ref byte[] extBulk) {
#if TEN_BIT_BLOCKS #if TEN_BIT_BLOCKS
if (p.hasExtBlocks) { if (p.hasExtBlocks) {
if (p.hasBulkBlockUpdate && count >= 150) { if (p.hasBulkBlockUpdate && count >= 150) {
@ -125,13 +128,15 @@ namespace MCGalaxy.Network {
data[0] = Opcode.CpeBulkBlockUpdate; data[0] = Opcode.CpeBulkBlockUpdate;
data[1] = (byte)(count - 1); data[1] = (byte)(count - 1);
for (int i = 0, j = 2; i < count; i++) { for (int i = 0, j = 2; i < count; i++)
{
int index = indices[i]; int index = indices[i];
data[j++] = (byte)(index >> 24); data[j++] = (byte)(index >> 16); data[j++] = (byte)(index >> 24); data[j++] = (byte)(index >> 16);
data[j++] = (byte)(index >> 8); data[j++] = (byte)index; data[j++] = (byte)(index >> 8); data[j++] = (byte)index;
} }
for (int i = 0, j = 2 + 256 * sizeof(int); i < count; i++) { for (int i = 0, j = 2 + 256 * sizeof(int); i < count; i++)
{
data[j++] = (BlockRaw)blocks[i]; data[j++] = (BlockRaw)blocks[i];
} }
@ -148,7 +153,8 @@ namespace MCGalaxy.Network {
byte[] MakeExt() { byte[] MakeExt() {
byte[] data = new byte[count * 9]; byte[] data = new byte[count * 9];
for (int i = 0, j = 0; i < count; i++) { for (int i = 0, j = 0; i < count; i++)
{
int index = indices[i]; int index = indices[i];
int x = (index % level.Width); int x = (index % level.Width);
int y = (index / level.Width) / level.Length; int y = (index / level.Width) / level.Length;
@ -171,12 +177,14 @@ namespace MCGalaxy.Network {
byte[] data = new byte[2 + 256 * 5]; byte[] data = new byte[2 + 256 * 5];
data[0] = Opcode.CpeBulkBlockUpdate; data[0] = Opcode.CpeBulkBlockUpdate;
data[1] = (byte)(count - 1); data[1] = (byte)(count - 1);
for (int i = 0, j = 2; i < count; i++) { for (int i = 0, j = 2; i < count; i++)
{
int index = indices[i]; int index = indices[i];
data[j++] = (byte)(index >> 24); data[j++] = (byte)(index >> 16); data[j++] = (byte)(index >> 24); data[j++] = (byte)(index >> 16);
data[j++] = (byte)(index >> 8); data[j++] = (byte)index; data[j++] = (byte)(index >> 8); data[j++] = (byte)index;
} }
for (int i = 0, j = 2 + 256 * sizeof(int); i < count; i++) { for (int i = 0, j = 2 + 256 * sizeof(int); i < count; i++)
{
#if TEN_BIT_BLOCKS #if TEN_BIT_BLOCKS
BlockID block = blocks[i]; BlockID block = blocks[i];
data[j++] = block <= 511 ? (BlockRaw)block : level.GetFallback(block); data[j++] = block <= 511 ? (BlockRaw)block : level.GetFallback(block);
@ -189,7 +197,8 @@ namespace MCGalaxy.Network {
byte[] MakeNormal() { byte[] MakeNormal() {
byte[] data = new byte[count * 8]; byte[] data = new byte[count * 8];
for (int i = 0, j = 0; i < count; i++) { for (int i = 0, j = 0; i < count; i++)
{
int index = indices[i]; int index = indices[i];
int x = (index % level.Width); int x = (index % level.Width);
int y = (index / level.Width) / level.Length; int y = (index / level.Width) / level.Length;
@ -211,7 +220,8 @@ namespace MCGalaxy.Network {
byte[] MakeLimited(byte[] fallback) { byte[] MakeLimited(byte[] fallback) {
byte[] data = new byte[count * 8]; byte[] data = new byte[count * 8];
for (int i = 0, j = 0; i < count; i++) { for (int i = 0, j = 0; i < count; i++)
{
int index = indices[i]; int index = indices[i];
int x = (index % level.Width); int x = (index % level.Width);
int y = (index / level.Width) / level.Length; int y = (index / level.Width) / level.Length;

5
MCGalaxy/Player/Player.Login.cs
View File

@ -62,7 +62,8 @@ namespace MCGalaxy
// fix for classicube java client, doesn't reply if only send EnvMapAppearance with version 2 // fix for classicube java client, doesn't reply if only send EnvMapAppearance with version 2
Send(Packet.ExtEntry(CpeExt.EnvMapAppearance, 1)); Send(Packet.ExtEntry(CpeExt.EnvMapAppearance, 1));
foreach (CpeExtension ext in Extensions) { foreach (CpeExtension ext in Extensions)
{
Send(Packet.ExtEntry(ext.Name, ext.ServerVersion)); Send(Packet.ExtEntry(ext.Name, ext.ServerVersion));
} }
} }
@ -105,8 +106,6 @@ namespace MCGalaxy
Server.Background.QueueOnce(ShowAltsTask, name, TimeSpan.Zero); Server.Background.QueueOnce(ShowAltsTask, name, TimeSpan.Zero);
CheckState(); CheckState();
if (!Directory.Exists("players"))
Directory.CreateDirectory("players");
PlayerDB.LoadNick(this); PlayerDB.LoadNick(this);
Game.Team = Team.TeamIn(this); Game.Team = Team.TeamIn(this);
SetPrefix(); SetPrefix();

2
MCGalaxy/Server/Server.cs
View File

@ -24,6 +24,7 @@ using System.Runtime.InteropServices;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Threading; using System.Threading;
using MCGalaxy.Commands; using MCGalaxy.Commands;
using MCGalaxy.DB;
using MCGalaxy.Drawing; using MCGalaxy.Drawing;
using MCGalaxy.Eco; using MCGalaxy.Eco;
using MCGalaxy.Events.ServerEvents; using MCGalaxy.Events.ServerEvents;
@ -141,6 +142,7 @@ namespace MCGalaxy {
EnsureDirectoryExists("ranks"); EnsureDirectoryExists("ranks");
RankInfo.EnsureExists(); RankInfo.EnsureExists();
Ban.EnsureExists(); Ban.EnsureExists();
PlayerDB.EnsureDirectoriesExist();
EnsureDirectoryExists("extra"); EnsureDirectoryExists("extra");
EnsureDirectoryExists(Paths.WaypointsDir); EnsureDirectoryExists(Paths.WaypointsDir);