Fixed core crash / Fixed error texture on shoot
This commit is contained in:
BIN
core/assets-raw/sprites/shapes/shape-3.png
Normal file
BIN
core/assets-raw/sprites/shapes/shape-3.png
Normal file
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 |
@@ -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){
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user