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

Tempranks can now be done to minute precision, /temprank info now uses relative timespans.

Browse Source
This commit is contained in:
UnknownShadow200 2016-08-29 14:25:48 +10:00
parent 7bed4d7963
commit 87effa41d8
4 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Commands/Moderation/CmdTempBan.cs
View File

@ -68,11 +68,11 @@ namespace MCGalaxy.Commands.Moderation {
}
public override void Help(Player p) {
Player.Message(p, "%T/tempban <name> <timespan> [reason]");
Player.Message(p, "%HBans <name> for <timespan>. Max is 1 day, default is 1 hour.");
Player.Message(p, "%H e.g. to tempban for 90 minutes, <timespan> would be 1h30m");
Player.Message(p, "%T/tempban [name] [timespan] <reason>");
Player.Message(p, "%HBans [name] for [timespan]. Max is 1 day, default is 1 hour.");
Player.Message(p, "%H e.g. to tempban for 90 minutes, [timespan] would be 1h30m");
Player.Message(p, "%HTemp bans will reset on server restart");
Player.Message(p, "%HFor [reason], @number can be used as a shortcut for that rule.");
Player.Message(p, "%HFor <reason>, @number can be used as a shortcut for that rule.");
}
}
}

52
Commands/Moderation/CmdTempRank.cs
View File

@ -28,7 +28,6 @@ namespace MCGalaxy.Commands.Moderation {
new CommandAlias("dtr", null, "delete"), new CommandAlias("temprankinfo", null, "info"),
new CommandAlias("trl", null, "list"), new CommandAlias("tempranklist", null, "list") }; }
}
const StringComparison comp = StringComparison.OrdinalIgnoreCase;
public override void Use(Player p, string message) {
string[] args = message.Split(' ');
@ -50,21 +49,19 @@ namespace MCGalaxy.Commands.Moderation {
}
static void Assign(Player p, string[] args) {
string player = args[0], rank = args[1], period = args[2];
string player = args[0];
Player who = PlayerInfo.Find(player);
if (who == null) {
player = PlayerInfo.FindName(player);
if (player == null) { Player.Message(p, "&cPlayer &a" + args[0] + "&c not found."); return; }
player = PlayerInfo.FindOfflineNameMatches(p, player);
if (player == null) return;
} else {
player = who.name;
}
Group group = Group.FindMatches(p, rank);
Group group = Group.FindMatches(p, args[1]);
if (group == null) return;
int periodTime;
if (!Int32.TryParse(period, out periodTime)) {
Player.Message(p, "&cThe period needs to be a number."); return;
}
TimeSpan delta;
if (!args[2].TryParseShort(p, 'h', "temp rank for", out delta)) return;
foreach (string line in Server.TempRanks.Find(player)) {
Player.Message(p, "&cThe player already has a temporary rank assigned!"); return;
@ -83,14 +80,14 @@ namespace MCGalaxy.Commands.Moderation {
DateTime now = DateTime.Now;
string assigner = p == null ? "Console" : p.name;
string data = player + " " + rank + " " + pGroup.name + " " + period + " " + now.Minute + " " +
now.Hour + " " + now.Day + " " + now.Month + " " + now.Year + " " + assigner;
string data = player + " " + args[1] + " " + pGroup.name + " " + delta.Hours + " " + now.Minute + " " +
now.Hour + " " + now.Day + " " + now.Month + " " + now.Year + " " + assigner + " " + delta.Minutes;
Server.TempRanks.Append(data);
Command.all.Find("setrank").Use(null, player + " " + group.name + " assigning temp rank");
Player.Message(p, "Temp ranked {0} to {1}%S for {2} hours", player, group.ColoredName, period);
Player.Message(p, "Temp ranked {0} to {1}%S for {2}", player, group.ColoredName, delta.Shorten());
if (who != null)
Player.Message(who, "You have been temp ranked to {0}%S for {1} hours", group.ColoredName, period);
Player.Message(who, "You have been temp ranked to {0}%S for {1}", group.ColoredName, delta.Shorten());
}
static void Delete(Player p, string name) {
@ -99,7 +96,7 @@ namespace MCGalaxy.Commands.Moderation {
Player who = PlayerInfo.Find(name);
foreach (string line in File.ReadAllLines("text/tempranks.txt")) {
if (!line.StartsWith(name, comp)) { all.AppendLine(line); continue; }
if (!line.CaselessStarts(name)) { all.AppendLine(line); continue; }
string[] parts = line.Split(' ');
Group newgroup = Group.Find(parts[2]);
@ -118,7 +115,7 @@ namespace MCGalaxy.Commands.Moderation {
static void Info(Player p, string name) {
foreach (string line in File.ReadAllLines("text/tempranks.txt")) {
if (!line.StartsWith(name, comp)) continue;
if (!line.CaselessStarts(name)) continue;
PrintTempRankInfo(p, line); return;
}
Player.Message(p, "&cPlayer &a{0}&chas not been assigned a temporary rank.", name);
@ -139,27 +136,32 @@ namespace MCGalaxy.Commands.Moderation {
static void PrintTempRankInfo(Player p, string line) {
string[] args = line.Split(' ');
string temprank = args[1], oldrank = args[2], tempranker = args[9];
int minutes = Convert.ToInt32(args[4]), hours = Convert.ToInt32(args[5]);
int days = Convert.ToInt32(args[6]), months = Convert.ToInt32(args[7]);
int years = Convert.ToInt32(args[8]);
int period = Convert.ToInt32(args[3]);
int min = int.Parse(args[4]), hour = int.Parse(args[5]);
int day = int.Parse(args[6]), month = int.Parse(args[7]), year = int.Parse(args[8]);
int periodH = int.Parse(args[3]), periodM = 0;
if (args.Length > 10) periodM = int.Parse(args[10]);
Group oldGrp = Group.Find(oldrank), tempGrp = Group.Find(temprank);
string oldCol = oldGrp == null ? "" : oldGrp.color;
string tempCol = tempGrp == null ? "" : tempGrp.color;
DateTime assignmentDate = new DateTime(years, months, days, hours, minutes, 0);
DateTime expireDate = assignmentDate.AddHours(Convert.ToDouble(period));
DateTime assigned = new DateTime(year, month, day, hour, min, 0);
DateTime expiry = assigned.AddHours(periodH).AddMinutes(periodM);
TimeSpan delta = DateTime.Now - assigned;
TimeSpan expireDelta = expiry - DateTime.Now;
Player.Message(p, "Temp rank information for {0}:", args[0]);
Player.Message(p, " From {0} %Sto {1}%S, by {2} on &a{3}%S, expires on &a{4}",
Player.Message(p, " From {0} %Sto {1}%S, by {2} &a{3}%S ago, expires in &a{4}",
oldCol + oldrank, tempCol + temprank, tempranker,
assignmentDate, expireDate);
delta.Shorten(), expireDelta.Shorten());
}
public override void Help(Player p) {
Player.Message(p, "%T/temprank <player> <rank> <period(hours)>");
Player.Message(p, "%T/temprank [player] [rank] [timespan]");
Player.Message(p, "%HSets a temporary rank for the specified player.");
Player.Message(p, "%T/temprank <player> info");
Player.Message(p, "%H e.g. to temprank for 90 minutes, [timespan] would be 1h30m");
Player.Message(p, "%T/temprank [player] info");
Player.Message(p, "%HLists information about the temp rank for the given player.");
Player.Message(p, "%T/temprank <player> delete %H- Removes player's temp rank.");
Player.Message(p, "%T/temprank list %H- Lists all current temp ranks.");

34
Server/Server.Tasks.cs
View File

@ -126,29 +126,27 @@ namespace MCGalaxy {
}
void TemprankExpiryTask(SchedulerTask task) {
Player[] players = PlayerInfo.Online.Items;
const StringComparison comp = StringComparison.OrdinalIgnoreCase;
Player[] players = PlayerInfo.Online.Items;
foreach (Player p in players) {
foreach (string line in File.ReadAllLines("text/tempranks.txt")) {
if (!line.StartsWith(p.name, comp)) continue;
string[] args = line.Split(' ');
foreach (string line in File.ReadAllLines("text/tempranks.txt"))
foreach (Player p in players)
{
if (!line.CaselessStarts(p.name)) continue;
string[] args = line.Split(' ');
int period = Convert.ToInt32(args[3]);
int minutes = Convert.ToInt32(args[4]);
int hours = Convert.ToInt32(args[5]);
int days = Convert.ToInt32(args[6]);
int months = Convert.ToInt32(args[7]);
int years = Convert.ToInt32(args[8]);
DateTime expire = new DateTime(years, months, days, hours, minutes, 0).AddHours(period);
if (DateTime.Now >= expire)
Command.all.Find("temprank").Use(null, p.name + " delete");
}
int min = int.Parse(args[4]), hour = int.Parse(args[5]);
int day = int.Parse(args[6]), month = int.Parse(args[7]), year = int.Parse(args[8]);
int periodH = int.Parse(args[3]), periodM = 0;
if (args.Length > 10) periodM = int.Parse(args[10]);
DateTime expire = new DateTime(year, month, day, hour, min, 0)
.AddHours(periodH).AddMinutes(periodM);
if (DateTime.Now >= expire)
Command.all.Find("temprank").Use(null, p.name + " delete");
}
DateTime now = DateTime.UtcNow;
task.Delay = TimeSpan.FromSeconds(60 - now.Second);
task.Delay = TimeSpan.FromSeconds(60 - now.Second); // TODO: down to seconds
}
}
}

19
util/Math/DirUtils.cs
View File

@ -108,12 +108,19 @@ namespace MCGalaxy {
double yawRad = Math.Asin(dir.X / cosPitch);
yaw = (byte)(yawRad * rad2Packed);
pitch = (byte)(pitchRad * rad2Packed);
// Other side of unit circle
if (dir.Z > 0) yaw = (byte)(128 - yaw);
// Almost exactly +X or -X
if (dir.Z >= 0 && dir.Z < +0.0000001) yaw = 192;
if (dir.Z <= 0 && dir.Z > -0.0000001) yaw = 64;
yaw = AdjustYaw(dir, yaw);
}
static byte AdjustYaw(Vec3F32 dir, byte yaw) {
// Other side of unit circle
if (dir.Z > 0) return (byte)(128 - yaw);
const double epsilon = 0.0000001;
if (dir.Z >= 0 && dir.Z < +epsilon) return 192; // exactly +X
if (dir.Z <= 0 && dir.Z > -epsilon) return 64; // exactly -X
if (dir.X >= 0 && dir.X < +epsilon) return 0; // exactly -Z
if (dir.X <= 0 && dir.X > -epsilon) return 128; // exactly +Z
return yaw;
}
}
}