Fixed core crash / Fixed error texture on shoot

This commit is contained in:
Anuken
2018-09-11 18:12:11 -04:00
parent 5d309c39cf
commit 75fae9454d
6 changed files with 923 additions and 909 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 96 KiB

View File

@@ -164,6 +164,9 @@ public class Block extends BaseBlock {
public void playerPlaced(Tile tile){ public void playerPlaced(Tile tile){
} }
public void removed(Tile tile){
}
/** Called after the block is placed by anyone. */ /** Called after the block is placed by anyone. */
public void placed(Tile tile){ public void placed(Tile tile){
} }

View File

@@ -397,6 +397,7 @@ public class Tile implements PosTrait, TargetTrait{
private void preChanged(){ private void preChanged(){
synchronized(tileSetLock){ synchronized(tileSetLock){
block().removed(this);
if(entity != null){ if(entity != null){
entity.removeFromProximity(); entity.removeFromProximity();
} }

View File

@@ -86,6 +86,11 @@ public class CoreBlock extends StorageBlock{
return state.teams.get(tile.getTeam()).cores.size > 1; return state.teams.get(tile.getTeam()).cores.size > 1;
} }
@Override
public void removed(Tile tile){
state.teams.get(tile.getTeam()).cores.removeValue(tile, true);
}
@Override @Override
public void placed(Tile tile){ public void placed(Tile tile){
state.teams.get(tile.getTeam()).cores.add(tile); state.teams.get(tile.getTeam()).cores.add(tile);
@@ -166,10 +171,8 @@ public class CoreBlock extends StorageBlock{
@Override @Override
public void onDestroyed(Tile tile){ public void onDestroyed(Tile tile){
//TODO more dramatic effects
super.onDestroyed(tile); super.onDestroyed(tile);
//TODO more dramatic effects
state.teams.get(tile.getTeam()).cores.removeValue(tile, true);
} }
@Override @Override