diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index a9cca9fb85..ea6f6087c1 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -130,7 +130,7 @@ public class PlayerListFragment extends Fragment{ t.addImageButton(Icon.zoomSmall, Styles.clearPartiali, () -> Call.onAdminRequest(user, AdminAction.trace)); }).padRight(12).size(bs + 10f, bs); - }else if((!user.isLocal && !user.isAdmin) && net.client() && playerGroup.size() >= 3){ //votekick + }else if((!user.isLocal && !user.isAdmin) && net.client() && playerGroup.size() >= 3 && player.getTeam() != user.getTeam()){ //votekick button.add().growY(); button.addImageButton(Icon.banSmall, Styles.clearPartiali, diff --git a/core/src/mindustry/world/blocks/RespawnBlock.java b/core/src/mindustry/world/blocks/RespawnBlock.java index 581dec8b21..b27b0af621 100644 --- a/core/src/mindustry/world/blocks/RespawnBlock.java +++ b/core/src/mindustry/world/blocks/RespawnBlock.java @@ -5,6 +5,7 @@ import arc.math.*; import mindustry.entities.type.*; import mindustry.graphics.*; import mindustry.type.*; +import mindustry.ui.*; import mindustry.world.*; import static mindustry.Vars.net; @@ -20,7 +21,7 @@ public class RespawnBlock{ Draw.reset(); if(player != null){ - TextureRegion region = player.getIconRegion(); + TextureRegion region = to.icon(Cicon.full); Draw.color(0f, 0f, 0f, 0.4f * progress); Draw.rect("circle-shadow", tile.drawx(), tile.drawy(), region.getWidth() / 3f, region.getWidth() / 3f); diff --git a/core/src/mindustry/world/blocks/units/MechPad.java b/core/src/mindustry/world/blocks/units/MechPad.java index 9ff7223dc6..0dadebc018 100644 --- a/core/src/mindustry/world/blocks/units/MechPad.java +++ b/core/src/mindustry/world/blocks/units/MechPad.java @@ -112,7 +112,7 @@ public class MechPad extends Block{ MechFactoryEntity entity = tile.ent(); if(entity.player != null){ - RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? mech : Mechs.starter)); + RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? Mechs.starter : mech)); } } diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fastlane/metadata/android/es-ES/video.txt b/fastlane/metadata/android/es-ES/video.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/fastlane/metadata/android/es-ES/video.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fastlane/metadata/android/ja-JP/video.txt b/fastlane/metadata/android/ja-JP/video.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fastlane/metadata/android/ru-RU/video.txt b/fastlane/metadata/android/ru-RU/video.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fastlane/metadata/android/uk/video.txt b/fastlane/metadata/android/uk/video.txt deleted file mode 100644 index e69de29bb2..0000000000