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

Fix 'round end' being shown twice when the round ended with humans surviving, fix entities being repeatedly respawned, update /time to also show the time left in the round when running with zombie survival.

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-22 22:55:12 +11:00
parent a24dbf123d
commit b5eaa7d4d2
3 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Commands/Information/CmdTime.cs
View File

@ -16,28 +16,36 @@
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
namespace MCGalaxy.Commands using MCGalaxy.Games;
{
public sealed class CmdTime : Command namespace MCGalaxy.Commands {
{
public sealed class CmdTime : Command {
public override string name { get { return "time"; } } public override string name { get { return "time"; } }
public override string shortcut { get { return ""; } } public override string shortcut { get { return "ti"; } }
public override string type { get { return CommandTypes.Information; } } public override string type { get { return CommandTypes.Information; } }
public override bool museumUsable { get { return true; } } public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } }
public CmdTime() { } public CmdTime() { }
public override void Use(Player p, string message) public override void Use(Player p, string message) {
{ string time = DateTime.Now.ToString("HH:mm:ss"); //DateTime.Now.ToString();
string time = DateTime.Now.ToString("HH:mm:ss"); Player.SendMessage(p, "Server time is " + time);
message = "Server time is " + time; if (Server.zombie.Status != ZombieGameStatus.NotStarted) {
Player.SendMessage(p, message); int delta = (int)(DateTime.UtcNow - Server.zombie.RoundEnd);
//message = "full Date/Time is " + DateTime.Now.ToString(); if (delta > 0) {
//Player.SendMessage(p, message); Player.SendMessage(p, "&a" + delta + " %Sseconds until the round ends.");
} else {
delta = (int)(DateTime.UtcNow - Server.zombie.RoundStart);
if (delta > 0)
Player.SendMessage(p, "&a" + delta + " %Sseconds until the round starts.");
} }
public override void Help(Player p) }
{ }
public override void Help(Player p) {
Player.SendMessage(p, "/time - Shows the server time."); Player.SendMessage(p, "/time - Shows the server time.");
Player.SendMessage(p, "If zombie survival is running, shows time left until round end or start.");
} }
} }
} }

5
Games/ZombieSurvival/ZombieGame.Core.cs
View File

@ -156,7 +156,7 @@ namespace MCGalaxy.Games {
UpdatePlayerColor(pKiller, Colors.red); UpdatePlayerColor(pKiller, Colors.red);
bool aliveChanged = false; bool aliveChanged = false;
foreach (Player pAlive in alive) { foreach (Player pAlive in alive) {
UpdatePlayerColor(pAlive, pAlive.group.color); UpdatePlayerColor(pAlive, pAlive.color);
if (Math.Abs(pAlive.pos[0] - pKiller.pos[0]) > HitboxPrecision if (Math.Abs(pAlive.pos[0] - pKiller.pos[0]) > HitboxPrecision
|| Math.Abs(pAlive.pos[1] - pKiller.pos[1]) > HitboxPrecision || Math.Abs(pAlive.pos[1] - pKiller.pos[1]) > HitboxPrecision
|| Math.Abs(pAlive.pos[2] - pKiller.pos[2]) > HitboxPrecision) || Math.Abs(pAlive.pos[2] - pKiller.pos[2]) > HitboxPrecision)
@ -228,7 +228,7 @@ namespace MCGalaxy.Games {
Player.GlobalSpawn(p, p.pos[0], p.pos[1], p.pos[2], p.rot[0], p.rot[1], false); Player.GlobalSpawn(p, p.pos[0], p.pos[1], p.pos[2], p.rot[0], p.rot[1], false);
} }
public void EndRound(object sender, ElapsedEventArgs e) { void EndRound(object sender, ElapsedEventArgs e) {
if (Status == ZombieGameStatus.NotStarted) return; if (Status == ZombieGameStatus.NotStarted) return;
CurrentLevel.ChatLevel("%4Round End:%f 5"); Thread.Sleep(1000); CurrentLevel.ChatLevel("%4Round End:%f 5"); Thread.Sleep(1000);
CurrentLevel.ChatLevel("%4Round End:%f 4"); Thread.Sleep(1000); CurrentLevel.ChatLevel("%4Round End:%f 4"); Thread.Sleep(1000);
@ -239,6 +239,7 @@ namespace MCGalaxy.Games {
} }
public void HandOutRewards() { public void HandOutRewards() {
if (!RoundInProgress) return;
RoundInProgress = false; RoundInProgress = false;
RoundStart = DateTime.MinValue; RoundStart = DateTime.MinValue;
RoundEnd = DateTime.MinValue; RoundEnd = DateTime.MinValue;

2
Games/ZombieSurvival/ZombieGame.cs
View File

@ -155,7 +155,7 @@ namespace MCGalaxy.Games {
Infected.Remove(p); Infected.Remove(p);
Alive.Add(p); Alive.Add(p);
p.infected = false; p.infected = false;
UpdatePlayerColor(p, p.group.color); UpdatePlayerColor(p, p.color);
UpdateAllPlayerStatus(); UpdateAllPlayerStatus();
} }