Several fixes.

2020-08-30 13:53:15 +02:00
parent c6e2de6156
commit 8f73a9a43a
6 changed files with 17 additions and 17 deletions
--- a/src/Battling/Battle/Battle.cpp
+++ b/src/Battling/Battle/Battle.cpp
@@ -8,6 +8,8 @@ void PkmnLib::Battling::Battle::SetWeather(const ArbUt::StringView& name) {
    _eventHook.Trigger<WeatherChangeEvent>(name);
 }
 void PkmnLib::Battling::Battle::ClearWeather() {
+    if (_weatherScript == nullptr)
+        return;
    _weatherScript->OnRemove();
    _weatherScript = nullptr;
    _eventHook.Trigger<WeatherChangeEvent>(""_cnc);