Remove config hotpatch because real fix is in.

Pryaxis · Oct 27, 2013 · c54f7bd · c54f7bd
1 parent af3e5df
commit c54f7bd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
@@ -276,10 +276,6 @@ public int
 
 		[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;
-
         /// <summary>
         /// Reads a configuration file from a given path
         /// </summary>

diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
@@ -648,7 +648,6 @@ private void OnUpdate(EventArgs args)
 			}
 		}
 
-		private bool lastTickDay = false;
 		private void OnSecondUpdate()
 		{
 			if (Config.ForceTime != "normal")
@@ -663,20 +662,6 @@ private void OnSecondUpdate()
 						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)
 			{