mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-29 00:50:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #5474

Browse Source
This commit is contained in:
Anuken 2021-06-25 19:35:34 -04:00
parent 47443d5ae7
commit eaeb67b91f
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@ -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"){{

3
core/src/mindustry/content/Bullets.java
View File

@ -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;

6
core/src/mindustry/content/UnitTypes.java
View File

@ -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}){

10
core/src/mindustry/net/ArcNetProvider.java
View File

@ -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