Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #5703

Browse Source
This commit is contained in:
Anuken
2021-08-06 09:04:07 -04:00
parent 4fa04b9e23
commit b8232326bc
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/Block.java
View File

@@ -887,7 +887,7 @@ public class Block extends UnlockableContent{
} }
//generate paletted team regions //generate paletted team regions
if(teamRegion.found()){ if(teamRegion != null && teamRegion.found()){
for(Team team : Team.all){ for(Team team : Team.all){
//if there's an override, don't generate anything //if there's an override, don't generate anything
if(team.hasPalette && !Core.atlas.has(name + "-team-" + team.name)){ if(team.hasPalette && !Core.atlas.has(name + "-team-" + team.name)){

8
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -302,7 +302,13 @@ public class CoreBlock extends StorageBlock{
@Override @Override
public void afterDestroyed(){ public void afterDestroyed(){
if(state.rules.coreCapture){ 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 //building does not exist on client yet
if(!net.client()){ if(!net.client()){
//core is invincible for several seconds to prevent recapture //core is invincible for several seconds to prevent recapture

2
gradle.properties
View File

@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
#needed for android compilation #needed for android compilation
android.useAndroidX=true android.useAndroidX=true
archash=fd433d5d1b3406a6f1c1fd7dad7e3591634ceeab archash=68277c42b4883e5fcb01dfa20fd27a5434ace891