AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-27 23:43:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pack Level.UndoPos(saving 2 bytes) and Level.BlockPos(saving 2 bytes) more efficiently, reducing memory usage even further.

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-15 14:55:09 +11:00
parent 290189d3c4
commit 8695d90945
7 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Commands/Information/CmdAbout.cs
View File

@ -84,11 +84,12 @@ namespace MCGalaxy.Commands
for (int i = 0; i < inCache.Count; i++) for (int i = 0; i < inCache.Count; i++)
{ {
foundOne = true; foundOne = true;
Deleted = inCache[i].deleted; Deleted = (inCache[i].flags & 1) != 0;
Username = inCache[i].name; Username = inCache[i].name;
DateTime time = Server.StartTimeLocal.AddSeconds(inCache[i].timeDelta); DateTime time = Server.StartTimeLocal.AddSeconds(inCache[i].flags >> 2);
TimePerformed = time.ToString("yyyy-MM-dd HH:mm:ss"); TimePerformed = time.ToString("yyyy-MM-dd HH:mm:ss");
BlockUsed = Block.Name(inCache[i].type); byte inBlock = (inCache[i].flags & 2) != 0 ? Block.custom_block : inCache[i].rawType;
BlockUsed = Block.Name(inBlock);
if (!Deleted) if (!Deleted)
Player.SendMessage(p, "&3Created by " + Server.FindColor(Username.Trim()) + Username.Trim() + Server.DefaultColor + ", using &3" + BlockUsed); Player.SendMessage(p, "&3Created by " + Server.FindColor(Username.Trim()) + Username.Trim() + Server.DefaultColor + ", using &3" + BlockUsed);

4
Commands/Moderation/CmdFreeze.cs
View File

@ -28,10 +28,10 @@ namespace MCGalaxy.Commands
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
if (message == "") { Help(p); return; } if (message == "") { Help(p); return; }
Player who = PlayerInfo.FindOrShowMatches(message); Player who = PlayerInfo.FindOrShowMatches(p, message);
if (who == null) return; if (who == null) return;
if (p == who) { Player.SendMessage(p, "Cannot freeze yourself."); return; } if (p == who) { Player.SendMessage(p, "Cannot freeze yourself."); return; }
if (p != nul && who.group.Permission >= p.group.Permission) { if (p != null && who.group.Permission >= p.group.Permission) {
Player.SendMessage(p, "Cannot freeze someone of equal or greater rank."); return; Player.SendMessage(p, "Cannot freeze someone of equal or greater rank."); return;
} }

13
Commands/building/CmdUndo.cs
View File

@ -206,17 +206,20 @@ namespace MCGalaxy.Commands
} }
bool CheckBlockPhysics(Player p, long seconds, int i, Level.UndoPos undo) { bool CheckBlockPhysics(Player p, long seconds, int i, Level.UndoPos undo) {
byte b = p.level.GetTile(undo.location); byte b = p.level.GetTile(undo.index);
DateTime time = Server.StartTime.AddTicks(undo.timeDelta * TimeSpan.TicksPerSecond); DateTime time = Server.StartTime.AddTicks((undo.flags >> 2) * TimeSpan.TicksPerSecond);
if (time.AddTicks(seconds * TimeSpan.TicksPerSecond) < DateTime.UtcNow) return false; if (time.AddTicks(seconds * TimeSpan.TicksPerSecond) < DateTime.UtcNow) return false;
if (b == undo.newType || Block.Convert(b) == Block.water || Block.Convert(b) == Block.lava) { byte newType = (undo.flags & 2) != 0 ? Block.custom_block : undo.newRawType;
if (b == newType || Block.Convert(b) == Block.water || Block.Convert(b) == Block.lava) {
ushort x, y, z; ushort x, y, z;
p.level.IntToPos(undo.location, out x, out y, out z); p.level.IntToPos(undo.index, out x, out y, out z);
int undoIndex = p.level.currentUndo; int undoIndex = p.level.currentUndo;
p.level.currentUndo = i; p.level.currentUndo = i;
p.level.currentUndo = undoIndex; p.level.currentUndo = undoIndex;
p.level.Blockchange(x, y, z, undo.oldType, true, "", undo.oldExtType, false); byte oldType = (undo.flags & 1) != 0 ? Block.custom_block : undo.oldRawType;
byte oldExtType = (undo.flags & 1) != 0 ? undo.oldRawType : (byte)0;
p.level.Blockchange(x, y, z, oldType, true, "", oldExtType, false);
} }
return true; return true;
} }

9
Levels/BlockQueue.cs
View File

@ -62,20 +62,17 @@ namespace MCGalaxy {
int count = blockupdates; int count = blockupdates;
if (l.blockqueue.Count < blockupdates || l.players.Count == 0) if (l.blockqueue.Count < blockupdates || l.players.Count == 0)
count = l.blockqueue.Count; count = l.blockqueue.Count;
Level.BlockPos bP; Level.BlockPos bP = default(Level.BlockPos);
for (int c = 0; c < count; c++) { for (int c = 0; c < count; c++) {
block item = l.blockqueue[c]; block item = l.blockqueue[c];
bP.name = item.p.name; bP.name = item.p.name;
bP.timeDelta = (int)DateTime.UtcNow.Subtract(Server.StartTime).TotalSeconds;
ushort x, y, z; ushort x, y, z;
l.IntToPos(item.index, out x, out y, out z); l.IntToPos(item.index, out x, out y, out z);
bP.index = item.index; bP.index = item.index;
bP.type = item.type; bP.SetData(item.type, item.extType, item.type == 0);
bP.extType = item.extType; l.Blockchange(item.p, x, y, z, item.type, item.extType);
bP.deleted = bP.type == 0;
l.Blockchange(item.p, x, y, z, bP.type, bP.extType);
l.blockCache.Add(bP); l.blockCache.Add(bP);
} }
l.blockqueue.RemoveRange(0, count); l.blockqueue.RemoveRange(0, count);

15
Levels/Level.Blocks.cs
View File

@ -145,13 +145,10 @@ namespace MCGalaxy {
if (p == null) if (p == null)
return; return;
Level.BlockPos bP; Level.BlockPos bP = default(Level.BlockPos);
bP.name = p.name; bP.name = p.name;
bP.timeDelta = (int)DateTime.UtcNow.Subtract(Server.StartTime).TotalSeconds;
bP.index = b; bP.index = b;
bP.type = type; bP.SetData(type, extType, type == 0);
bP.extType = extType;
bP.deleted = bP.type == 0;
blockCache.Add(bP); blockCache.Add(bP);
Player.UndoPos Pos; Player.UndoPos Pos;
@ -395,11 +392,9 @@ namespace MCGalaxy {
PhysSpongeRemoved(b, true); PhysSpongeRemoved(b, true);
if (addUndo) { if (addUndo) {
UndoPos uP; UndoPos uP = default(UndoPos);
uP.location = b; uP.index = b;
uP.newType = type; uP.newExtType = extType; uP.SetData(oldBlock, oldExtType, type, extType);
uP.oldType = oldBlock; uP.oldExtType = oldExtType;
uP.timeDelta = (int)DateTime.UtcNow.Subtract(Server.StartTime).TotalSeconds;
if (currentUndo > Server.physUndo) { if (currentUndo > Server.physUndo) {
currentUndo = 0; currentUndo = 0;

49
Levels/Level.cs
View File

@ -23,6 +23,7 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using MCGalaxy.SQL; using MCGalaxy.SQL;
using Timer = System.Timers.Timer; using Timer = System.Timers.Timer;
@ -390,14 +391,14 @@ namespace MCGalaxy
BlockPos bP = tempCache[i]; BlockPos bP = tempCache[i];
IntToPos(bP.index, out x, out y, out z); IntToPos(bP.index, out x, out y, out z);
nameP.Value = bP.name; nameP.Value = bP.name;
DateTime time = Server.StartTimeLocal.AddTicks(bP.timeDelta * TimeSpan.TicksPerSecond); DateTime time = Server.StartTimeLocal.AddTicks((bP.flags >> 2) * TimeSpan.TicksPerSecond);
MakeInt(time.Year, 4, 0, ptr); MakeInt(time.Month, 2, 5, ptr); MakeInt(time.Day, 2, 8, ptr); MakeInt(time.Year, 4, 0, ptr); MakeInt(time.Month, 2, 5, ptr); MakeInt(time.Day, 2, 8, ptr);
MakeInt(time.Hour, 2, 11, ptr); MakeInt(time.Minute, 2, 14, ptr); MakeInt(time.Second, 2, 17, ptr); MakeInt(time.Hour, 2, 11, ptr); MakeInt(time.Minute, 2, 14, ptr); MakeInt(time.Second, 2, 17, ptr);
timeP.Value = date; timeP.Value = date;
xP.Value = x; yP.Value = y; zP.Value = z; xP.Value = x; yP.Value = y; zP.Value = z;
tileP.Value = bP.type; tileP.Value = (bP.flags & 2) != 0 ? Block.custom_block : bP.rawType;
delP.Value = bP.deleted; delP.Value = (bP.flags & 1) != 0;
if (!DatabaseTransactionHelper.Execute(template, cmd)) { if (!DatabaseTransactionHelper.Execute(template, cmd)) {
cmd.Dispose(); cmd.Dispose();
@ -730,19 +731,45 @@ namespace MCGalaxy
return players.Where(p => p.level == this).ToList(); return players.Where(p => p.level == this).ToList();
} }
[StructLayout(LayoutKind.Sequential, Pack = 1)]
public struct BlockPos { public struct BlockPos {
public string name; public string name;
public int timeDelta; public int flags, index; // bit 0 = is old ext, bit 1 = is new ext, rest bits = time delta
public int index; public byte rawType;
public byte type, extType;
public bool deleted; public void SetData(byte type, byte extType, bool delete) {
TimeSpan delta = DateTime.UtcNow.Subtract(Server.StartTime);
flags = (int)delta.TotalSeconds << 2;
flags |= (byte)(delete ? 1 : 0);
if (type == Block.custom_block) {
rawType = extType; flags |= 2;
} else {
rawType = type;
}
}
} }
[StructLayout(LayoutKind.Sequential, Pack = 1)]
public struct UndoPos { public struct UndoPos {
public int location; public int flags, index; // bit 0 = is old ext, bit 1 = is new ext, rest bits = time delta
public byte newType, newExtType; public byte oldRawType, newRawType;
public byte oldType, oldExtType;
public int timeDelta; public void SetData(byte oldType, byte oldExtType, byte newType, byte newExtType) {
TimeSpan delta = DateTime.UtcNow.Subtract(Server.StartTime);
flags = (int)delta.TotalSeconds << 2;
if (oldType == Block.custom_block) {
oldRawType = oldExtType; flags |= 1;
} else {
oldRawType = oldType;
}
if (newType == Block.custom_block) {
newRawType = newExtType; flags |= 2;
} else {
newRawType = newType;
}
}
} }
public struct Zone { public struct Zone {

17
Player/Player.Handlers.cs
View File

@ -64,17 +64,15 @@ namespace MCGalaxy {
RevertBlock(x, y, z); return; RevertBlock(x, y, z); return;
} }
Level.BlockPos bP; Level.BlockPos bP = default(Level.BlockPos);
bP.name = name; bP.name = name;
bP.timeDelta = (int)DateTime.UtcNow.Subtract(Server.StartTime).TotalSeconds;
bP.index = level.PosToInt(x, y, z); bP.index = level.PosToInt(x, y, z);
bP.type = type; bP.SetData(type, extType, false);
bP.extType = extType;
lastClick[0] = x; lastClick[1] = y; lastClick[2] = z; lastClick[0] = x; lastClick[1] = y; lastClick[2] = z;
if ( Blockchange != null ) { if ( Blockchange != null ) {
if ( Blockchange.Method.ToString().IndexOf("AboutBlockchange") == -1 && !level.IsMuseum ) { if ( Blockchange.Method.ToString().IndexOf("AboutBlockchange") == -1 && !level.IsMuseum ) {
bP.deleted = true; bP.flags |= 1;
level.blockCache.Add(bP); level.blockCache.Add(bP);
} }
@ -84,10 +82,7 @@ namespace MCGalaxy {
if ( PlayerBlockChange != null ) if ( PlayerBlockChange != null )
PlayerBlockChange(this, x, y, z, type, extType); PlayerBlockChange(this, x, y, z, type, extType);
OnBlockChangeEvent.Call(this, x, y, z, type, extType); OnBlockChangeEvent.Call(this, x, y, z, type, extType);
if ( cancelBlock ) { if ( cancelBlock ) { cancelBlock = false; return; }
cancelBlock = false;
return;
}
if ( group.Permission == LevelPermission.Banned ) return; if ( group.Permission == LevelPermission.Banned ) return;
if ( group.Permission == LevelPermission.Guest ) { if ( group.Permission == LevelPermission.Guest ) {
@ -133,12 +128,10 @@ namespace MCGalaxy {
if ( Block.portal(b) ) { HandlePortal(this, x, y, z, b); return; } if ( Block.portal(b) ) { HandlePortal(this, x, y, z, b); return; }
if ( Block.mb(b) ) { HandleMsgBlock(this, x, y, z, b); return; } if ( Block.mb(b) ) { HandleMsgBlock(this, x, y, z, b); return; }
} }
bP.flags |= 1;
bP.deleted = true;
level.blockCache.Add(bP); level.blockCache.Add(bP);
DeleteBlock(b, x, y, z, type, extType); DeleteBlock(b, x, y, z, type, extType);
} else { } else {
bP.deleted = false;
level.blockCache.Add(bP); level.blockCache.Add(bP);
PlaceBlock(b, x, y, z, type, extType); PlaceBlock(b, x, y, z, type, extType);
} }