From c54f7bd850b442d0537d5a0b6a22e143bb4423f0 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Sat, 26 Oct 2013 21:57:47 -0400 Subject: [PATCH] Remove config hotpatch because real fix is in. --- TShockAPI/ConfigFile.cs | 4 ---- TShockAPI/TShock.cs | 15 --------------- 2 files changed, 19 deletions(-) diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index 6ca3ddbe..6f66607e 100755 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -276,10 +276,6 @@ namespace TShockAPI [Description("Forces your world to be in Halloween mode regardless of the data.")] public bool ForceHalloween = false; - [Description("Disables the pumpkin moon when the night is over, regardless of wave.")] public bool DisablePumpkinMoonOnDaybreak = false; - - [Description("Disables the pumpkin moon when the night is over if you reached wave 15.")] public bool DisablePumpkinMoonAfterWave15 = false; - /// /// Reads a configuration file from a given path /// diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index c72a86de..d215df12 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -648,7 +648,6 @@ namespace TShockAPI } } - private bool lastTickDay = false; private void OnSecondUpdate() { if (Config.ForceTime != "normal") @@ -663,20 +662,6 @@ namespace TShockAPI break; } } - - if (!lastTickDay && Main.dayTime) - { - lastTickDay = true; - if (Config.DisablePumpkinMoonOnDaybreak || (Config.DisablePumpkinMoonAfterWave15 && NPC.waveCount == 15)) - { - Main.pumpkinMoon = false; - } - - } - else if (lastTickDay && !Main.dayTime) - { - lastTickDay = false; - } foreach (TSPlayer player in Players) {