diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 7386f73454..ca94653885 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1589,13 +1589,13 @@ public class Blocks implements ContentList{ shots = 4; burstSpacing = 5; inaccuracy = 10f; - range = 210f; + range = 215f; xRand = 6f; size = 2; health = 300 * size * size; shootSound = Sounds.missile; - limitRange(2f); + limitRange(5f); }}; salvo = new ItemTurret("salvo"){{ diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 674cb514e2..560e34f6cd 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -257,7 +257,6 @@ public class Bullets implements ContentList{ width = 8f; height = 8f; shrinkY = 0f; - drag = -0.01f; splashDamageRadius = 30f; splashDamage = 30f * 1.5f; ammoMultiplier = 5f; @@ -274,7 +273,6 @@ public class Bullets implements ContentList{ width = 7f; height = 8f; shrinkY = 0f; - drag = -0.01f; homingPower = 0.08f; splashDamageRadius = 20f; splashDamage = 20f * 1.5f; @@ -288,7 +286,6 @@ public class Bullets implements ContentList{ width = 8f; height = 8f; shrinkY = 0f; - drag = -0.01f; splashDamageRadius = 25f; splashDamage = 25f * 1.4f; hitEffect = Fx.blastExplosion; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b5225e6b85..a41909ebe6 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2046,10 +2046,10 @@ public class UnitTypes implements ContentList{ buildSpeed = 3f; - abilities.add(new EnergyFieldAbility(35f, 65f, 180f){{ - repair = 35f; + abilities.add(new EnergyFieldAbility(40f, 65f, 180f){{ + repair = 40f; statusDuration = 60f * 6f; - maxTargets = 25; + maxTargets = 30; }}); for(float mountY : new float[]{-18f, 14}){ diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java index ba8ff4cfa0..9cbad476ad 100644 --- a/core/src/mindustry/net/ArcNetProvider.java +++ b/core/src/mindustry/net/ArcNetProvider.java @@ -391,7 +391,15 @@ public class ArcNetProvider implements NetProvider{ //no compression, copy over buffer if(compression == 0){ buffer.position(0).limit(length); - buffer.put(byteBuffer.array(), byteBuffer.position(), length); + if(byteBuffer.hasArray()){ + buffer.put(byteBuffer.array(), byteBuffer.position(), length); + }else{ + byte[] readcopy = new byte[length]; + int pos = byteBuffer.position(); + byteBuffer.get(readcopy); + byteBuffer.position(pos); + buffer.put(readcopy); + } buffer.position(0); packet.read(reads.get(), length); //move read packets forward