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

launch pad fix

Browse Source
This commit is contained in:
Anuken
2019-09-16 23:25:09 -04:00
parent 4b824f7a4c
commit 669ce6dfbb
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java
View File

@@ -77,8 +77,9 @@ public class LaunchPad extends StorageBlock{
for(Item item : Vars.content.items()){ for(Item item : Vars.content.items()){
Events.fire(Trigger.itemLaunch); Events.fire(Trigger.itemLaunch);
Effects.effect(Fx.padlaunch, tile); Effects.effect(Fx.padlaunch, tile);
data.addItem(item, entity.items.get(item)); int used = Math.min(entity.items.get(item), itemCapacity);
entity.items.set(item, 0); data.addItem(item, used);
entity.items.remove(item, used);
} }
} }
} }

12
desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java
View File

@@ -19,6 +19,18 @@ public class SWorkshop implements SteamUGCCallback{
private Map lastMap; private Map lastMap;
public SWorkshop(){
int items = ugc.getNumSubscribedItems();
SteamPublishedFileID[] ids = new SteamPublishedFileID[items];
ugc.getSubscribedItems(ids);
for(int i = 0; i < items; i++){
SteamPublishedFileID id = ids[i];
ItemInstallInfo info = new ItemInstallInfo();
ugc.getItemInstallInfo(id, info);
}
}
public void publishMap(Map map){ public void publishMap(Map map){
FloatingDialog dialog = new FloatingDialog("$confirm"); FloatingDialog dialog = new FloatingDialog("$confirm");
dialog.setFillParent(false); dialog.setFillParent(false);