diff --git a/core/assets/maps/hidden-serpulo/265.msav b/core/assets/maps/hidden-serpulo/265.msav index 1e0f167c7e..0a35dbead8 100644 Binary files a/core/assets/maps/hidden-serpulo/265.msav and b/core/assets/maps/hidden-serpulo/265.msav differ diff --git a/core/src/mindustry/maps/SectorSubmissions.java b/core/src/mindustry/maps/SectorSubmissions.java index 1123778998..a9e6e0615c 100644 --- a/core/src/mindustry/maps/SectorSubmissions.java +++ b/core/src/mindustry/maps/SectorSubmissions.java @@ -50,7 +50,7 @@ public class SectorSubmissions{ registerSerpuloSector(191, "Skeledragon", "https://discord.com/channels/391020510269669376/1379926912004001914/1380025875806027849"); //alternate, more difficult submission: https://discord.com/channels/391020510269669376/1379926782966497322/1416145231853781022 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(24, "Stormrider", "https://discord.com/channels/391020510269669376/1379926797042581716/1399404131520876577"); registerSerpuloSector(263, "ltb12", "https://discord.com/channels/391020510269669376/1379928050010951694/1417750251741249569"); diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java index 51c07de96f..684e5deeb4 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -206,12 +206,12 @@ public class ItemTurret extends Turret{ int amount = read.ub(); for(int i = 0; i < amount; i++){ 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 if(item != null && ammoTypes.containsKey(item)){ - totalAmmo += a; - ammo.add(new ItemEntry(item, a)); + totalAmmo += itemAmount; + ammo.add(new ItemEntry(item, itemAmount)); } } }