From 42d66d113692c189817bb7746b107b5b7d556a4f Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 9 Dec 2020 16:26:50 -0500 Subject: [PATCH] Sector item system cleanup --- core/src/mindustry/type/Sector.java | 5 ----- core/src/mindustry/ui/dialogs/PlanetDialog.java | 2 ++ fastlane/metadata/android/en-US/changelogs/29775.txt | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29775.txt diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index b107e3cb95..dda4cc6a6c 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -152,10 +152,6 @@ public class Sector{ return res % 2 == 0 ? res : res + 1; } - public void addItem(Item item, int amount){ - removeItem(item, -amount); - } - public void removeItems(ItemSeq items){ ItemSeq copy = items.copy(); copy.each((i, a) -> copy.set(i, -a)); @@ -169,7 +165,6 @@ public class Sector{ } public void addItems(ItemSeq items){ - if(net.client()) return; if(isBeingPlayed()){ if(state.rules.defaultTeam.core() != null){ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 76f5c95daa..f419f78968 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -795,6 +795,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } void playSelected(){ + if(selected == null) return; + Sector sector = selected; if(sector.isBeingPlayed()){ diff --git a/fastlane/metadata/android/en-US/changelogs/29775.txt b/fastlane/metadata/android/en-US/changelogs/29775.txt new file mode 100644 index 0000000000..b4550ee5ce --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29775.txt @@ -0,0 +1,2 @@ +[This is a truncated changelog, see Github for full notes] +- Fixed a common crash related to planet selection