From 689b0b8c6101f9b0933cfdbcfab8da43a222f81e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 20:04:08 -0500 Subject: [PATCH] Fixed games never ending --- core/src/mindustry/core/Logic.java | 2 +- fastlane/metadata/android/en-US/changelogs/102.1.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/102.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/29561.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/29564.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/29567.txt | 5 +++++ 6 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/102.1.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/102.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29561.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29564.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29567.txt diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 12761439b7..e7c84adbc8 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -261,7 +261,7 @@ public class Logic implements ApplicationListener{ } } - if(!net.client() && !world.isInvalidMap() && !state.isEditor() && !state.rules.canGameOver){ + if(!net.client() && !world.isInvalidMap() && !state.isEditor() && state.rules.canGameOver){ checkGameOver(); } } diff --git a/fastlane/metadata/android/en-US/changelogs/102.1.txt b/fastlane/metadata/android/en-US/changelogs/102.1.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/102.1.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/102.txt b/fastlane/metadata/android/en-US/changelogs/102.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/102.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/29561.txt b/fastlane/metadata/android/en-US/changelogs/29561.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29561.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/29564.txt b/fastlane/metadata/android/en-US/changelogs/29564.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29564.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/29567.txt b/fastlane/metadata/android/en-US/changelogs/29567.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29567.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins)