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

View File

@@ -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)){

View File

@@ -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