From 660abe188b923f786661723eebf29e19a84855c7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 17 Jul 2020 08:46:11 -0400 Subject: [PATCH] Fixed #2237 --- core/assets-raw/sprites/units/risse-cell.png | Bin 0 -> 796 bytes core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/content/UnitTypes.java | 2 +- core/src/mindustry/editor/MapResizeDialog.java | 2 +- core/src/mindustry/editor/WaveInfoDialog.java | 12 ++++++------ core/src/mindustry/ui/dialogs/LoadoutDialog.java | 2 +- .../world/blocks/distribution/ItemBridge.java | 4 +++- server/src/mindustry/server/ServerControl.java | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 core/assets-raw/sprites/units/risse-cell.png diff --git a/core/assets-raw/sprites/units/risse-cell.png b/core/assets-raw/sprites/units/risse-cell.png new file mode 100644 index 0000000000000000000000000000000000000000..f01db0e5b1cc7f574d87772cddd0e42a5ca1a626 GIT binary patch literal 796 zcmV+%1LOROP)EX>4Tx04R}tkv&MmKpe$iQ$;P64ptCx$WWbH5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|;_9U6A|?K>DYS_3;J6>}?mh0_0YbgZG^=YI&~)2O zCE{WxyDIj)B7hJE5k;TOEMrcRlJFc~_we!cF2=LG&;2?2)ttoupGZ8*4AUmwAfDc| z4bJ<-VOEq?;&bAtNf#u3?RNSu0mr>z@3D!JNLb%ypV0NMI35kRU=q6(y8mBSx!EiiH&I$36VRO}|7gg4!CxZDATo($QPo06ZVkk13}XY@^3VBi)Athv3l_Hp_Eq^Yaq4RCM> zj1?$*-Q(T8oxS~grq$mMUqy1Cq+hd=0003~NklgZ000000000000000fI{zSO7Ce(y~HgwwoYJa zU7(-m^OF4TihG5x)(OnEPG?G~_{46-i1Z|cX~5d|<1q|FSrg{(&aom2(}3l*a7V$G zF(X|;VG@~bo%nGav+}$$)?Gp+Gg}s}v|v}pf>_eO)_IiZ_K{o{zSrxe%cS>CeUDA( zF5$B)r?)0Fc@Ky-muZ<#^#&|A8lefT^Qqc^yXHN)BFu@ZHDGIFIrE<1*DLF@wWB#v z%_cOP1+6z;+Jv0q@8wccwFZ1LY|CvzN%6OGsyVEy{*&#KA|L&fJi8u_idVY!9jaeJ zXB)h;04>+vU9-GKd&+M1){xC0{{R30000000000 a(7+$khuXUKdJC`s0000 { int val = Integer.parseInt(value); if(w) width = val; else height = val; - }).valid(value -> Strings.canParsePostiveInt(value) && Integer.parseInt(value) <= maxSize && Integer.parseInt(value) >= minSize).addInputDialog(3); + }).valid(value -> Strings.canParsePositiveInt(value) && Integer.parseInt(value) <= maxSize && Integer.parseInt(value) >= minSize).addInputDialog(3); table.row(); } diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java index 77574793af..56ecfa9de3 100644 --- a/core/src/mindustry/editor/WaveInfoDialog.java +++ b/core/src/mindustry/editor/WaveInfoDialog.java @@ -149,14 +149,14 @@ public class WaveInfoDialog extends BaseDialog{ t.row(); t.table(spawns -> { spawns.field("" + (group.begin + 1), TextFieldFilter.digitsOnly, text -> { - if(Strings.canParsePostiveInt(text)){ + if(Strings.canParsePositiveInt(text)){ group.begin = Strings.parseInt(text) - 1; updateWaves(); } }).width(100f); spawns.add("$waves.to").padLeft(4).padRight(4); spawns.field(group.end == never ? "" : (group.end + 1) + "", TextFieldFilter.digitsOnly, text -> { - if(Strings.canParsePostiveInt(text)){ + if(Strings.canParsePositiveInt(text)){ group.end = Strings.parseInt(text) - 1; updateWaves(); }else if(text.isEmpty()){ @@ -169,7 +169,7 @@ public class WaveInfoDialog extends BaseDialog{ t.table(p -> { p.add("$waves.every").padRight(4); p.field(group.spacing + "", TextFieldFilter.digitsOnly, text -> { - if(Strings.canParsePostiveInt(text) && Strings.parseInt(text) > 0){ + if(Strings.canParsePositiveInt(text) && Strings.parseInt(text) > 0){ group.spacing = Strings.parseInt(text); updateWaves(); } @@ -180,7 +180,7 @@ public class WaveInfoDialog extends BaseDialog{ t.row(); t.table(a -> { a.field(group.unitAmount + "", TextFieldFilter.digitsOnly, text -> { - if(Strings.canParsePostiveInt(text)){ + if(Strings.canParsePositiveInt(text)){ group.unitAmount = Strings.parseInt(text); updateWaves(); } @@ -198,7 +198,7 @@ public class WaveInfoDialog extends BaseDialog{ t.row(); t.table(a -> { a.field((int)group.shields + "", TextFieldFilter.digitsOnly, text -> { - if(Strings.canParsePostiveInt(text)){ + if(Strings.canParsePositiveInt(text)){ group.shields = Strings.parseInt(text); updateWaves(); } @@ -206,7 +206,7 @@ public class WaveInfoDialog extends BaseDialog{ a.add(" + "); a.field((int)group.shieldScaling + "", TextFieldFilter.digitsOnly, text -> { - if(Strings.canParsePostiveInt(text)){ + if(Strings.canParsePositiveInt(text)){ group.shieldScaling = Strings.parseInt(text); updateWaves(); } diff --git a/core/src/mindustry/ui/dialogs/LoadoutDialog.java b/core/src/mindustry/ui/dialogs/LoadoutDialog.java index e367bc08da..079b5b5245 100644 --- a/core/src/mindustry/ui/dialogs/LoadoutDialog.java +++ b/core/src/mindustry/ui/dialogs/LoadoutDialog.java @@ -82,7 +82,7 @@ public class LoadoutDialog extends BaseDialog{ }).size(bsize); t.button(Icon.pencil, Styles.cleari, () -> ui.showTextInput("$configure", stack.item.localizedName, 10, stack.amount + "", true, str -> { - if(Strings.canParsePostiveInt(str)){ + if(Strings.canParsePositiveInt(str)){ int amount = Strings.parseInt(str); if(amount >= 0 && amount <= capacity){ stack.amount = amount; diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index add5bdd595..5fcd64c674 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -112,7 +112,9 @@ public class ItemBridge extends Block{ return false; } - return (other.block() == tile.block() || (!(tile.block() instanceof ItemBridge) && other.block() == this)) && (other.team() == tile.team() || tile.block() != this) && (!checkDouble || other.bc().link != tile.pos()); + return ((other.block() == tile.block() && tile.block() == this) || (!(tile.block() instanceof ItemBridge) && other.block() == this)) + && (other.team() == tile.team() || tile.block() != this) + && (!checkDouble || other.bc().link != tile.pos()); } public Tile findLink(int x, int y){ diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 863e7763f8..03703921c1 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -477,7 +477,7 @@ public class ServerControl implements ApplicationListener{ return; } - if(Strings.canParsePostiveInt(arg[0]) && Strings.parseInt(arg[0]) > 0){ + if(Strings.canParsePositiveInt(arg[0]) && Strings.parseInt(arg[0]) > 0){ int lim = Strings.parseInt(arg[0]); netServer.admins.setPlayerLimit(lim); info("Player limit is now &lc@.", lim);