mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-19 20:37:28 +03:00
Fixed #5703
This commit is contained in:
parent
4fa04b9e23
commit
b8232326bc
@ -887,7 +887,7 @@ public class Block extends UnlockableContent{
|
||||
}
|
||||
|
||||
//generate paletted team regions
|
||||
if(teamRegion.found()){
|
||||
if(teamRegion != null && teamRegion.found()){
|
||||
for(Team team : Team.all){
|
||||
//if there's an override, don't generate anything
|
||||
if(team.hasPalette && !Core.atlas.has(name + "-team-" + team.name)){
|
||||
|
@ -302,7 +302,13 @@ public class CoreBlock extends StorageBlock{
|
||||
@Override
|
||||
public void afterDestroyed(){
|
||||
if(state.rules.coreCapture){
|
||||
tile.setNet(block, lastDamage, 0);
|
||||
if(!net.client()){
|
||||
tile.setBlock(block, lastDamage);
|
||||
}
|
||||
|
||||
//delay so clients don't destroy it afterwards
|
||||
Core.app.post(() -> tile.setNet(block, lastDamage, 0));
|
||||
|
||||
//building does not exist on client yet
|
||||
if(!net.client()){
|
||||
//core is invincible for several seconds to prevent recapture
|
||||
|
@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
|
||||
kotlin.stdlib.default.dependency=false
|
||||
#needed for android compilation
|
||||
android.useAndroidX=true
|
||||
archash=fd433d5d1b3406a6f1c1fd7dad7e3591634ceeab
|
||||
archash=68277c42b4883e5fcb01dfa20fd27a5434ace891
|
||||
|
Loading…
Reference in New Issue
Block a user