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

Fixed #11284 / Cap item turret ammo on save read

Browse Source
This commit is contained in:
Anuken
2025-10-13 20:27:47 +09:00
parent ea72441958
commit a35f7605f7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/hidden-serpulo/265.msav
View File

Binary file not shown.

2
core/src/mindustry/maps/SectorSubmissions.java
View File

@@ -50,7 +50,7 @@ public class SectorSubmissions{
registerSerpuloSector(191, "Skeledragon", "https://discord.com/channels/391020510269669376/1379926912004001914/1380025875806027849"); registerSerpuloSector(191, "Skeledragon", "https://discord.com/channels/391020510269669376/1379926912004001914/1380025875806027849");
//alternate, more difficult submission: https://discord.com/channels/391020510269669376/1379926782966497322/1416145231853781022 //alternate, more difficult submission: https://discord.com/channels/391020510269669376/1379926782966497322/1416145231853781022
registerSerpuloSector(6, "Namero", "https://discord.com/channels/391020510269669376/1379926782966497322/1415735385828495464"); registerSerpuloSector(6, "Namero", "https://discord.com/channels/391020510269669376/1379926782966497322/1415735385828495464");
registerSerpuloSector(265, "Dem0", "https://discord.com/channels/391020510269669376/1379928052921929891/1416344658904088641"); registerSerpuloSector(265, "Dem0", "https://discord.com/channels/391020510269669376/1379928052921929891/1420029529619173459");
registerSerpuloSector(161, "Hengryton Luck", "https://discord.com/channels/391020510269669376/1379926882203730024/1416686287204782217"); registerSerpuloSector(161, "Hengryton Luck", "https://discord.com/channels/391020510269669376/1379926882203730024/1416686287204782217");
registerSerpuloSector(24, "Stormrider", "https://discord.com/channels/391020510269669376/1379926797042581716/1399404131520876577"); registerSerpuloSector(24, "Stormrider", "https://discord.com/channels/391020510269669376/1379926797042581716/1399404131520876577");
registerSerpuloSector(263, "ltb12", "https://discord.com/channels/391020510269669376/1379928050010951694/1417750251741249569"); registerSerpuloSector(263, "ltb12", "https://discord.com/channels/391020510269669376/1379928050010951694/1417750251741249569");

6
core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
View File

@@ -206,12 +206,12 @@ public class ItemTurret extends Turret{
int amount = read.ub(); int amount = read.ub();
for(int i = 0; i < amount; i++){ for(int i = 0; i < amount; i++){
Item item = Vars.content.item(revision < 2 ? read.ub() : read.s()); Item item = Vars.content.item(revision < 2 ? read.ub() : read.s());
short a = read.s(); int itemAmount = Math.min(read.s(), maxAmmo);
//only add ammo if this is a valid ammo type //only add ammo if this is a valid ammo type
if(item != null && ammoTypes.containsKey(item)){ if(item != null && ammoTypes.containsKey(item)){
totalAmmo += a; totalAmmo += itemAmount;
ammo.add(new ItemEntry(item, a)); ammo.add(new ItemEntry(item, itemAmount));
} }
} }
} }