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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-10-16 15:27:30 -04:00
parent 1fbced0433
commit e00daffe6d
14 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,7 +333,7 @@ public class CoreBlock extends StorageBlock{
@Override
public void itemTaken(Item item){
if(state.isCampaign()){
if(state.isCampaign() && team == state.rules.defaultTeam){
//update item taken amount
state.secinfo.handleCoreItem(item, -1);
}
@@ -342,7 +342,9 @@ public class CoreBlock extends StorageBlock{
@Override
public void handleItem(Building source, Item item){
if(net.server() || !net.active()){
state.secinfo.handleCoreItem(item, 1);
if(team == state.rules.defaultTeam){
state.secinfo.handleCoreItem(item, 1);
}
if(items.get(item) >= getMaximumAccepted(item)){
//create item incineration effect at random intervals

4
core/src/mindustry/world/blocks/storage/StorageBlock.java
View File

@@ -46,7 +46,9 @@ public class StorageBlock extends Block{
@Override
public void handleItem(Building source, Item item){
if(linkedCore != null){
incinerateEffect(this, source);
if(linkedCore.items.get(item) >= ((CoreBuild)linkedCore).storageCapacity){
incinerateEffect(this, source);
}
((CoreBuild)linkedCore).noEffect = true;
linkedCore.handleItem(source, item);
}else{