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

Tabs to spaces

Browse Source
This commit is contained in:
UnknownShadow200 2017-05-18 00:22:17 +10:00
parent 7e8df6cb7c
commit 71d360534d
34 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MCGalaxy/Blocks/Behaviour/BlockBehaviour.cs
View File

@ -159,7 +159,7 @@ namespace MCGalaxy.Blocks {
physicsHandlers[Block.train] = TrainPhysics.Do;
for (int i = 0; i < Block.Count; i++) {
HandlePhysics animalAI = AnimalAIHandler(Block.Props[i].AnimalAI);
HandlePhysics animalAI = AnimalAIHandler(Block.Props[i].AnimalAI);
if (animalAI != null) { physicsHandlers[i] = animalAI; continue; }
//Adv physics updating anything placed next to water or lava

2
MCGalaxy/Blocks/Behaviour/DeleteBehaviour.cs
View File

@ -40,7 +40,7 @@ namespace MCGalaxy.Blocks {
byte b2 = p.level.GetBlock(x + dx , y + dy, z + dz);
if ( b1 == Block.air && b2 == Block.air && p.level.CheckClear((ushort)( x + dx * 2 ), (ushort)( y + dy * 2 ), (ushort)( z + dz * 2 ))
&& p.level.CheckClear((ushort)( x + dx ), (ushort)( y + dy ), (ushort)( z + dz )) ) {
p.level.Blockchange((ushort)( x + dx * 2 ), (ushort)( y + dy * 2 ), (ushort)( z + dz * 2 ), (ExtBlock)Block.rockethead);
p.level.Blockchange((ushort)( x + dx * 2 ), (ushort)( y + dy * 2 ), (ushort)( z + dz * 2 ), (ExtBlock)Block.rockethead);
p.level.Blockchange((ushort)( x + dx ), (ushort)( y + dy ), (ushort)( z + dz ), (ExtBlock)Block.lava_fire);
}
}

4
MCGalaxy/Blocks/Behaviour/PlaceBehaviour.cs
View File

@ -27,7 +27,7 @@ namespace MCGalaxy.Blocks {
}
internal static void Dirt(Player p, byte block, ushort x, ushort y, ushort z) {
DirtGrass(p, (ExtBlock)Block.dirt, x, y, z);
DirtGrass(p, (ExtBlock)Block.dirt, x, y, z);
}
static void DirtGrass(Player p, ExtBlock block, ushort x, ushort y, ushort z) {
@ -48,7 +48,7 @@ namespace MCGalaxy.Blocks {
internal static void Stairs(Player p, byte block, ushort x, ushort y, ushort z) {
if (!(p.level.physics == 0 || p.level.physics == 5)
|| p.level.GetBlock(x, y - 1, z) != Block.staircasestep) {
p.ChangeBlock(x, y, z, (ExtBlock)Block.staircasestep); return;
p.ChangeBlock(x, y, z, (ExtBlock)Block.staircasestep); return;
}
p.SendBlockchange(x, y, z, ExtBlock.Air); // send the air block back only to the user

2
MCGalaxy/Blocks/ExtBlock.cs
View File

@ -52,7 +52,7 @@ namespace MCGalaxy {
}
public static ExtBlock FromRaw(byte raw, bool customBit) {
if (!customBit) return (ExtBlock)raw;
if (!customBit) return (ExtBlock)raw;
return new ExtBlock(Block.custom_block, raw);
}

2
MCGalaxy/Commands/Fun/CmdMissile.cs
View File

@ -88,7 +88,7 @@ namespace MCGalaxy.Commands.Fun {
Player hitP = GetPlayer(p, pos, true);
if (hitP != null) {
if (p.level.physics >= 3 && bp.ending >= EndType.Explode) {
hitP.HandleDeath((ExtBlock)Block.stone, " was blown up by " + p.ColoredName, true);
hitP.HandleDeath((ExtBlock)Block.stone, " was blown up by " + p.ColoredName, true);
} else {
hitP.HandleDeath((ExtBlock)Block.stone, " was hit a missile from " + p.ColoredName);
}

2
MCGalaxy/Commands/Information/CmdTop.cs
View File

@ -53,7 +53,7 @@ namespace MCGalaxy.Commands.Info {
Player.Message(p, "&a{0}:", stat.Title());
for (int i = 0; i < db.Rows.Count; i++) {
string player = PlayerInfo.GetColoredName(p, db.Rows[i]["Name"].ToString());
string player = PlayerInfo.GetColoredName(p, db.Rows[i]["Name"].ToString());
string item = db.Rows[i][stat.Column].ToString();
Player.Message(p, "{0}) {1} %S- {2}", offset + (i + 1), player, stat.Formatter(item));
}

22
MCGalaxy/Commands/Maintenance/CmdPlayerEdit.cs
View File

@ -49,10 +49,10 @@ namespace MCGalaxy.Commands.Maintenance {
switch (args[1].ToLower()) {
case "firstlogin":
SetDate(p, args, PlayerData.ColumnFirstLogin, who,
v => who.firstLogin = v); break;
v => who.firstLogin = v); break;
case "lastlogin":
SetDate(p, args, PlayerData.ColumnLastLogin, who,
v => who.timeLogged = v); break;
v => who.timeLogged = v); break;
case "logins":
case "totallogin":
@ -165,7 +165,7 @@ namespace MCGalaxy.Commands.Maintenance {
setter(span);
} else {
long secs = (long)span.TotalSeconds;
UpdateDB(args[0], secs.ToString(), column);
UpdateDB(args[0], secs.ToString(), column);
}
MessageDataChanged(p, args[0], args[1], span.Shorten(true));
}
@ -197,10 +197,10 @@ namespace MCGalaxy.Commands.Maintenance {
long loValue = long.Parse(value);
// OR with existing high bits of value in DB
using (DataTable results = Database.Backend.GetRows("Players", column, "WHERE Name = @0", name)) {
if (results.Rows.Count > 0) {
long curValue = PlayerData.ParseLong(results.Rows[0][column].ToString());
loValue |= (curValue & ~PlayerData.LowerBitsMask);
}
if (results.Rows.Count > 0) {
long curValue = PlayerData.ParseLong(results.Rows[0][column].ToString());
loValue |= (curValue & ~PlayerData.LowerBitsMask);
}
}
Database.Backend.UpdateRows("Players", column + " = @1", "WHERE Name = @0", name, loValue);
}
@ -209,10 +209,10 @@ namespace MCGalaxy.Commands.Maintenance {
long hiValue = long.Parse(value) << PlayerData.LowerBits;
// OR with existing low bits of value in DB
using (DataTable results = Database.Backend.GetRows("Players", column, "WHERE Name = @0", name)) {
if (results.Rows.Count > 0) {
long curValue = PlayerData.ParseLong(results.Rows[0][column].ToString());
hiValue |= (curValue & PlayerData.LowerBitsMask);
}
if (results.Rows.Count > 0) {
long curValue = PlayerData.ParseLong(results.Rows[0][column].ToString());
hiValue |= (curValue & PlayerData.LowerBitsMask);
}
}
Database.Backend.UpdateRows("Players", column + " = @1", "WHERE Name = @0", name, hiValue);
}

2
MCGalaxy/Commands/building/CmdCenter.cs
View File

@ -57,7 +57,7 @@ namespace MCGalaxy.Commands.Building {
static void Place(Player p, int x, int y, int z) {
p.level.UpdateBlock(p, (ushort)x, (ushort)y, (ushort)z,
(ExtBlock)Block.goldsolid, BlockDBFlags.Drawn);
(ExtBlock)Block.goldsolid, BlockDBFlags.Drawn);
}
public override void Help(Player p) {

2
MCGalaxy/Commands/building/CmdMessageBlock.cs
View File

@ -170,7 +170,7 @@ namespace MCGalaxy.Commands.Building {
static void ShowMessageBlocks(Player p, DataTable table) {
foreach (DataRow row in table.Rows) {
p.SendBlockchange(U16(row["X"]), U16(row["Y"]), U16(row["Z"]), (ExtBlock)Block.green);
p.SendBlockchange(U16(row["X"]), U16(row["Y"]), U16(row["Z"]), (ExtBlock)Block.green);
}
Player.Message(p, "Now showing &a" + table.Rows.Count + " %SMBs.");
}

4
MCGalaxy/Commands/building/CmdPortal.cs
View File

@ -165,7 +165,7 @@ namespace MCGalaxy.Commands.Building {
if (row["ExitMap"].ToString() == p.level.name) {
p.SendBlockchange(U16(row["ExitX"]), U16(row["ExitY"]), U16(row["ExitZ"]), (ExtBlock)Block.red);
}
p.SendBlockchange(U16(row["EntryX"]), U16(row["EntryY"]), U16(row["EntryZ"]), (ExtBlock)Block.green);
p.SendBlockchange(U16(row["EntryX"]), U16(row["EntryY"]), U16(row["EntryZ"]), (ExtBlock)Block.green);
}
Player.Message(p, "Now showing &a" + table.Rows.Count + " %Sportals.");
@ -173,7 +173,7 @@ namespace MCGalaxy.Commands.Building {
static void HidePortals(Player p, DataTable table) {
foreach (DataRow row in table.Rows) {
if (row["ExitMap"].ToString() == p.level.name) {
if (row["ExitMap"].ToString() == p.level.name) {
p.RevertBlock(U16(row["ExitX"]), U16(row["ExitY"]), U16(row["ExitZ"]));
}
p.RevertBlock(U16(row["EntryX"]), U16(row["EntryY"]), U16(row["EntryZ"]));

2
MCGalaxy/CorePlugin/ChatHandler.cs
View File

@ -24,7 +24,7 @@ namespace MCGalaxy.Core {
internal static void HandleCommand(string cmd, Player p, string message) {
if (!Server.CoreSecretCommands) return;
//DO NOT REMOVE THE TWO COMMANDS BELOW, /PONY AND /RAINBOWDASHLIKESCOOLTHINGS. -EricKilla
if (cmd == "pony") {
if (p.ponycount < 2) {

2
MCGalaxy/Database/ParameterisedQuery.cs
View File

@ -22,7 +22,7 @@ using System.Data.Common;
namespace MCGalaxy.SQL {
/// <summary> Callback function invoked on a row returned from an SQL query. </summary>
/// <summary> Callback function invoked on a row returned from an SQL query. </summary>
public delegate void ReaderCallback(IDataReader reader);
/// <summary> Represents an SQL command or query, that takes named parameters/arguments. </summary>

2
MCGalaxy/Database/Undo/UndoFormatText.cs
View File

@ -22,7 +22,7 @@ using System.IO;
namespace MCGalaxy.Undo {
/// <summary> Reads undo entries in the old MCForge undo text format. </summary>
/// <summary> Reads undo entries in the old MCForge undo text format. </summary>
public sealed class UndoFormatText : UndoFormat {
protected override string Ext { get { return ".undo"; } }

4
MCGalaxy/Drawing/Brushes/RainbowBrush.cs
View File

@ -22,7 +22,7 @@ namespace MCGalaxy.Drawing.Brushes {
public sealed class RainbowBrush : Brush {
ExtBlock block = default(ExtBlock);
ExtBlock block = default(ExtBlock);
public override string Name { get { return "Rainbow"; } }
public override ExtBlock NextBlock(DrawOp op) {
@ -36,7 +36,7 @@ namespace MCGalaxy.Drawing.Brushes {
public sealed class BWRainbowBrush : Brush {
ExtBlock block = default(ExtBlock);
ExtBlock block = default(ExtBlock);
public override string Name { get { return "BWRainbow"; } }
static byte[] blocks = new byte[] { Block.iron, Block.white, Block.lightgrey,

2
MCGalaxy/Drawing/DrawOps/CuboidDrawOps.cs
View File

@ -115,7 +115,7 @@ namespace MCGalaxy.Drawing.Ops {
i = (i + stepX) % 13;
if (Level.GetTile(x, y, z) != Block.air) {
block.BlockID = (byte)(Block.red + i);
output(Place(x, y, z, block));
output(Place(x, y, z, block));
}
}
i = startX;

4
MCGalaxy/Drawing/DrawOps/ReplaceDrawOp.cs
View File

@ -45,7 +45,7 @@ namespace MCGalaxy.Drawing.Ops {
for (ushort z = p1.Z; z <= p2.Z; z++)
for (ushort x = p1.X; x <= p2.X; x++)
{
ExtBlock block = Level.GetExtBlock(x, y, z);
ExtBlock block = Level.GetExtBlock(x, y, z);
if (block == Include) output(Place(x, y, z, brush));
}
}
@ -73,7 +73,7 @@ namespace MCGalaxy.Drawing.Ops {
for (ushort z = p1.Z; z <= p2.Z; z++)
for (ushort x = p1.X; x <= p2.X; x++)
{
ExtBlock block = Level.GetExtBlock(x, y, z);
ExtBlock block = Level.GetExtBlock(x, y, z);
if (block != Exclude) output(Place(x, y, z, brush));
}
}

2
MCGalaxy/Drawing/DrawOps/TreeDrawOp.cs
View File

@ -52,7 +52,7 @@ namespace MCGalaxy.Drawing.Ops {
if (bT == Block.leaf && lvl.GetTile(xT, yT, zT) != Block.air) return;
if (bT != Block.leaf) {
output(Place(xT, yT, zT, (ExtBlock)bT));
output(Place(xT, yT, zT, (ExtBlock)bT));
} else {
output(Place(xT, yT, zT, brush));
}

4
MCGalaxy/Economy/Economy.DB.cs
View File

@ -53,8 +53,8 @@ namespace MCGalaxy.Eco {
UpdateStats(stats);
}
}
public struct EcoStats {
public string Player, Purchase, Payment, Salary, Fine;
public int TotalSpent;

4
MCGalaxy/Entity/Entity.cs
View File

@ -46,8 +46,8 @@ namespace MCGalaxy {
/// <summary> Gets or sets the orientation of this entity. </summary>
public Orientation Rot {
get { return Orientation.Unpack(Thread.VolatileRead(ref _rot)); }
set { Thread.VolatileWrite(ref _rot, value.Pack()); OnSetRot(); }
get { return Orientation.Unpack(Thread.VolatileRead(ref _rot)); }
set { Thread.VolatileWrite(ref _rot, value.Pack()); OnSetRot(); }
}
/// <summary> Gets or sets the position of this entity. </summary>

2
MCGalaxy/Games/LavaSurvival/LavaSurvival.Game.cs
View File

@ -34,8 +34,8 @@ namespace MCGalaxy.Games {
}
return false;
}
public override void PlayerJoinedServer(Player p) {
if (!active) return;
Player.Message(p, "There is a &aLava Survival %Sgame active! Join it by typing /ls go");

4
MCGalaxy/Levels/Level.Physics.cs
View File

@ -244,8 +244,8 @@ namespace MCGalaxy {
if (overRide) {
ExtBlock block;
block.BlockID = (byte)type;
block.ExtID = 0;
block.BlockID = (byte)type;
block.ExtID = 0;
// Is the Ext flag just an indicator for the block update?
if (data.ExtBlock && (data.Raw & PhysicsArgs.TypeMask) == 0) {

2
MCGalaxy/Network/IRCPlugin/IRCBot.cs
View File

@ -64,7 +64,7 @@ namespace MCGalaxy {
/// <summary> Sends an IRC message to the given channel. </summary>
public void Message(string channel, string message, bool color = true) {
if (!Enabled) return;
if (!Enabled) return;
message = ConvertMessage(message, color);
connection.Sender.PublicMessage(channel, message);
}

2
MCGalaxy/Network/IRCPlugin/IRCHandlers.cs
View File

@ -223,7 +223,7 @@ namespace MCGalaxy.Network {
string error;
if (!CheckIRCCommand(user, cmdName, channel, out error)) {
if (error != null) bot.Message(error, channel);
if (error != null) bot.Message(error, channel);
return false;
}

128
MCGalaxy/Network/IRCPlugin/IRCPlugin.cs
View File

@ -20,71 +20,71 @@ using MCGalaxy.Events;
namespace MCGalaxy.Network {
public sealed class IRCPlugin : Plugin_Simple {
public override string creator { get { return Server.SoftwareName + " team"; } }
public override string MCGalaxy_Version { get { return Server.VersionString; } }
public override string name { get { return "IRC_CorePlugin"; } }
public sealed class IRCPlugin : Plugin_Simple {
public override string creator { get { return Server.SoftwareName + " team"; } }
public override string MCGalaxy_Version { get { return Server.VersionString; } }
public override string name { get { return "IRC_CorePlugin"; } }
public override void Load(bool startup) {
OnPlayerConnectEvent.Register(HandleConnect, Priority.Low, this);
OnPlayerDisconnectEvent.Register(HandleDisconnect, Priority.Low, this);
OnPlayerChatEvent.Register(HandleChat, Priority.Low, this);
Player.DoPlayerAction += Player_PlayerAction;
}
public override void Unload(bool shutdown) {
OnPlayerConnectEvent.UnRegister(this);
OnPlayerDisconnectEvent.UnRegister(this);
OnPlayerChatEvent.UnRegister(this);
Player.DoPlayerAction -= Player_PlayerAction;
}
static void Player_PlayerAction(Player p, PlayerAction action,
string message, bool stealth) {
if (!Server.IRC.Enabled) return;
string msg = null;
if (action == PlayerAction.AFK && !p.hidden)
msg = p.ColoredName + " %Sis AFK " + message;
else if (action == PlayerAction.UnAFK && !p.hidden)
msg = p.ColoredName + " %Sis no longer AFK";
else if (action == PlayerAction.Joker)
msg = p.ColoredName + " %Sis now a &aJ&bo&ck&5e&9r%S";
else if (action == PlayerAction.Unjoker)
msg = p.ColoredName + " %Sis no longer a &aJ&bo&ck&5e&9r%S";
else if (action == PlayerAction.Me)
msg = "*" + p.DisplayName + " " + message;
else if (action == PlayerAction.Review)
msg = p.ColoredName + " %Sis requesting a review.";
else if (action == PlayerAction.JoinWorld && Server.ircShowWorldChanges && !p.hidden)
msg = p.ColoredName + " %Swent to &8" + message;
if (msg != null) Server.IRC.Say(msg, stealth);
}
static void HandleDisconnect(Player p, string reason) {
if (!Server.IRC.Enabled || p.hidden) return;
if (!Server.guestLeaveNotify && p.Rank <= LevelPermission.Guest) return;
Server.IRC.Say(p.ColoredName + " %Sleft the game (" + reason + "%S)", false);
}
public override void Load(bool startup) {
OnPlayerConnectEvent.Register(HandleConnect, Priority.Low, this);
OnPlayerDisconnectEvent.Register(HandleDisconnect, Priority.Low, this);
OnPlayerChatEvent.Register(HandleChat, Priority.Low, this);
Player.DoPlayerAction += Player_PlayerAction;
}
public override void Unload(bool shutdown) {
OnPlayerConnectEvent.UnRegister(this);
OnPlayerDisconnectEvent.UnRegister(this);
OnPlayerChatEvent.UnRegister(this);
Player.DoPlayerAction -= Player_PlayerAction;
}
static void Player_PlayerAction(Player p, PlayerAction action,
string message, bool stealth) {
if (!Server.IRC.Enabled) return;
string msg = null;
if (action == PlayerAction.AFK && !p.hidden)
msg = p.ColoredName + " %Sis AFK " + message;
else if (action == PlayerAction.UnAFK && !p.hidden)
msg = p.ColoredName + " %Sis no longer AFK";
else if (action == PlayerAction.Joker)
msg = p.ColoredName + " %Sis now a &aJ&bo&ck&5e&9r%S";
else if (action == PlayerAction.Unjoker)
msg = p.ColoredName + " %Sis no longer a &aJ&bo&ck&5e&9r%S";
else if (action == PlayerAction.Me)
msg = "*" + p.DisplayName + " " + message;
else if (action == PlayerAction.Review)
msg = p.ColoredName + " %Sis requesting a review.";
else if (action == PlayerAction.JoinWorld && Server.ircShowWorldChanges && !p.hidden)
msg = p.ColoredName + " %Swent to &8" + message;
if (msg != null) Server.IRC.Say(msg, stealth);
}
static void HandleDisconnect(Player p, string reason) {
if (!Server.IRC.Enabled || p.hidden) return;
if (!Server.guestLeaveNotify && p.Rank <= LevelPermission.Guest) return;
Server.IRC.Say(p.ColoredName + " %Sleft the game (" + reason + "%S)", false);
}
static void HandleConnect(Player p) {
if (!Server.IRC.Enabled || p.hidden) return;
if (!Server.guestJoinNotify && p.Rank <= LevelPermission.Guest) return;
if (Plugin.IsPlayerEventCanceled(PlayerEvents.PlayerLogin, p)) return;
Server.IRC.Say(p.ColoredName + " %Sjoined the game", false);
}
static void HandleConnect(Player p) {
if (!Server.IRC.Enabled || p.hidden) return;
if (!Server.guestJoinNotify && p.Rank <= LevelPermission.Guest) return;
if (Plugin.IsPlayerEventCanceled(PlayerEvents.PlayerLogin, p)) return;
Server.IRC.Say(p.ColoredName + " %Sjoined the game", false);
}
static char[] trimChars = new char[] { ' ' };
static void HandleChat(Player p, string message) {
if (!Server.IRC.Enabled) return;
if (message.Trim(trimChars) == "") return;
if (Plugin.IsPlayerEventCanceled(PlayerEvents.PlayerChat, p)) return;
string name = Server.ircPlayerTitles ? p.FullName : p.group.prefix + p.ColoredName;
Server.IRC.Say(name + "%S: " + message, p.opchat);
}
}
static char[] trimChars = new char[] { ' ' };
static void HandleChat(Player p, string message) {
if (!Server.IRC.Enabled) return;
if (message.Trim(trimChars) == "") return;
if (Plugin.IsPlayerEventCanceled(PlayerEvents.PlayerChat, p)) return;
string name = Server.ircPlayerTitles ? p.FullName : p.group.prefix + p.ColoredName;
Server.IRC.Say(name + "%S: " + message, p.opchat);
}
}
}

2
MCGalaxy/Network/Packets/Opcode.cs
View File

@ -19,7 +19,7 @@ using System;
namespace MCGalaxy.Network {
/// <summary> List of packet opcode bytes. (Packet identifiers) </summary>
/// <summary> List of packet opcode bytes. (Packet identifiers) </summary>
public static class Opcode {
public const byte Handshake = 0;

12
MCGalaxy/Network/Socket/INetworkSocket.cs
View File

@ -22,12 +22,12 @@ namespace MCGalaxy.Network {
/// <summary> Abstracts sending to/receiving from a network socket. </summary>
public interface INetworkSocket {
/// <summary> Gets the remote IP of this socket. </summary>
string RemoteIP { get; }
/// <summary> Receives next block of received data, asynchronously. </summary>
void ReceiveNextAsync();
/// <summary> Gets the remote IP of this socket. </summary>
string RemoteIP { get; }
/// <summary> Receives next block of received data, asynchronously. </summary>
void ReceiveNextAsync();
/// <summary> Sends a block of data, either synchronously or asynchronously. </summary>
void Send(byte[] buffer, bool sync = false);

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

@ -179,7 +179,7 @@ namespace MCGalaxy {
byte below = level.GetTile(x, (ushort)(y - 1), z);
if (below == Block.dirt && block.BlockID == Block.air) {
level.Blockchange(this, x, (ushort)(y - 1), z, (ExtBlock)Block.grass);
level.Blockchange(this, x, (ushort)(y - 1), z, (ExtBlock)Block.grass);
}
if (below == Block.grass && !level.LightPasses(block)) {
level.Blockchange(this, x, (ushort)(y - 1), z, (ExtBlock)Block.dirt);
@ -378,7 +378,7 @@ namespace MCGalaxy {
// level drown is in 10ths of a second, and there are 100 ticks/second
if (drownCount > level.drown * 10) {
HandleDeath((ExtBlock)Block.water);
HandleDeath((ExtBlock)Block.water);
drownCount = 0;
}
break;

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

@ -97,7 +97,7 @@ namespace MCGalaxy {
id = NextFreeId();
PlayerInfo.Online.Add(this);
}
SendMap(null);
if (disconnected) return;
loggedIn = true;

4
MCGalaxy/Player/Player.cs
View File

@ -50,7 +50,7 @@ namespace MCGalaxy {
public Player(Socket s) {
spamChecker = new SpamChecker(this);
try {
socket = new TcpSocket(this, s);
socket = new TcpSocket(this, s);
ip = socket.RemoteIP;
SessionID = Interlocked.Increment(ref sessionCounter) & SessionIDMask;
Server.s.Log(ip + " connected to the server.");
@ -93,7 +93,7 @@ namespace MCGalaxy {
public ExtBlock GetHeldBlock() {
if (modeType != 0) return (ExtBlock)modeType;
if (modeType != 0) return (ExtBlock)modeType;
byte raw = RawHeldBlock.BlockID;
if (raw < Block.CpeCount) return (ExtBlock)bindings[raw];
return RawHeldBlock;

2
MCGalaxy/Player/SpamChecker.cs
View File

@ -68,7 +68,7 @@ namespace MCGalaxy {
}
public bool CheckCommandSpam() {
if (!Server.CmdSpamCheck || Player.IsSuper(p)) return false;
if (!Server.CmdSpamCheck || Player.IsSuper(p)) return false;
lock (cmdLock) {
if (cmdLog.AddSpamEntry(Server.CmdSpamCount, Server.CmdSpamInterval))

4
MCGalaxy/Plugins/Events/EconomyEvents.cs
View File

@ -20,7 +20,7 @@ using MCGalaxy.Eco;
namespace MCGalaxy.Events {
/// <summary> Raised whenever a player's online money changes. </summary>
/// <summary> Raised whenever a player's online money changes. </summary>
public sealed class OnMoneyChangedEvent : IPluginEvent<Economy.OnMoneyChanged> {
internal OnMoneyChangedEvent(Economy.OnMoneyChanged method, Priority priority, Plugin plugin)
: base(method, priority, plugin) { }
@ -31,7 +31,7 @@ namespace MCGalaxy.Events {
}
}
/// <summary> Raised whenever an economic transaction occurs. </summary>
/// <summary> Raised whenever an economic transaction occurs. </summary>
public sealed class OnEcoTransactionEvent : IPluginEvent<Economy.OnEcoTransaction> {
internal OnEcoTransactionEvent(Economy.OnEcoTransaction method, Priority priority, Plugin plugin)
: base(method, priority, plugin) { }

2
MCGalaxy/Plugins/Events/Enums.cs
View File

@ -16,7 +16,7 @@
permissions and limitations under the Licenses.
*/
namespace MCGalaxy.Events {
/// <summary> These are server event that can be canceled </summary>
public enum ServerEvents {
//TODO

6
MCGalaxy/Plugins/Plugin.cs
View File

@ -18,8 +18,8 @@
using System;
namespace MCGalaxy {
/// <summary> Importance. Higher priority plugins have their handlers called before lower priority plugins. </summary>
/// <summary> Importance. Higher priority plugins have their handlers called before lower priority plugins. </summary>
public enum Priority : byte {
Low = 0,
Normal = 1,
@ -27,7 +27,7 @@ namespace MCGalaxy {
Critical = 3,
System_Level = 4
}
/// <summary> This class provides for more advanced modification to MCGalaxy </summary>
public abstract partial class Plugin {

6
MCGalaxy/Server/Server.Init.cs
View File

@ -96,7 +96,7 @@ namespace MCGalaxy {
void InitHeartbeat() {
try {
Heartbeat.InitHeartbeats();
Heartbeat.InitHeartbeats();
} catch (Exception e) {
Server.ErrorLog(e);
}
@ -145,8 +145,8 @@ namespace MCGalaxy {
oldMain.Unload(true, false);
} catch (Exception e) { Server.ErrorLog(e); }
}
void InitLavaSurvival() {
void InitLavaSurvival() {
if (!Server.lava.startOnStartup) return;
try {
Server.lava.Start();