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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-08-01 01:18:54 -04:00
parent 2ed8bdb2bc a9a454dd61
commit e3d3167b13
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/content/StatusEffects.java
View File

@@ -11,7 +11,7 @@ import mindustry.type.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class StatusEffects{ public class StatusEffects{
public static StatusEffect none, burning, freezing, unmoving, slow, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed, disarmed, electrified, invincible; public static StatusEffect none, burning, freezing, unmoving, slow, fast, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed, disarmed, electrified, invincible;
public static void load(){ public static void load(){
@@ -60,6 +60,15 @@ public class StatusEffects{
slow = new StatusEffect("slow"){{ slow = new StatusEffect("slow"){{
color = Pal.lightishGray; color = Pal.lightishGray;
speedMultiplier = 0.4f; speedMultiplier = 0.4f;
init(() -> opposite(fast));
}};
fast = new StatusEffect("fast"){{
color = Pal.boostTo;
speedMultiplier = 1.6f;
init(() -> opposite(slow));
}}; }};
wet = new StatusEffect("wet"){{ wet = new StatusEffect("wet"){{

2
core/src/mindustry/core/NetClient.java
View File

@@ -414,7 +414,7 @@ public class NetClient implements ApplicationListener{
//entity must not be added yet, so create it //entity must not be added yet, so create it
if(entity == null){ if(entity == null){
entity = (Syncc)EntityMapping.map(typeID).get(); entity = (Syncc)EntityMapping.map(typeID & 0xFF).get();
entity.id(id); entity.id(id);
if(!netClient.isEntityUsed(entity.id())){ if(!netClient.isEntityUsed(entity.id())){
add = true; add = true;

2
core/src/mindustry/core/NetServer.java
View File

@@ -947,7 +947,7 @@ public class NetServer implements ApplicationListener{
//write all entities now //write all entities now
dataStream.writeInt(entity.id()); //write id dataStream.writeInt(entity.id()); //write id
dataStream.writeByte(entity.classId()); //write type ID dataStream.writeByte(entity.classId() & 0xFF); //write type ID
entity.writeSync(Writes.get(dataStream)); //write entity entity.writeSync(Writes.get(dataStream)); //write entity
sent++; sent++;

14
servers_v7.json
View File

@@ -182,11 +182,11 @@
}, },
{ {
"name": "LifeTime", "name": "LifeTime",
"address": ["srv3.godlike.club:28561"] "address": ["srv3.godlike.club:28561", "srv3.godlike.club:26508"]
}, },
{ {
"name": "Cyandustry", "name": "Cyandustry",
"address": ["91.218.66.162:6568"], "address": ["91.218.66.162:6568"]
}, },
{ {
"name": "Four Family", "name": "Four Family",
@@ -202,6 +202,14 @@
}, },
{ {
"name": "3MIDustry", "name": "3MIDustry",
"address": ["3midustry.xyz:10", "3midustry.xyz:20", "3midustry.xyz:30"] "address": ["3midustry.xyz:10", "3midustry.xyz:20", "3midustry.xyz:30", "3midustry.xyz:40", "3midustry.xyz:50"]
},
{
"name": "ABCXYZ Community",
"address": ["118.127.8.162:25617", "78.108.218.117:25640"]
},
{
"name": "Vanilla CroCraft",
"address": ["130.61.175.47:6567"]
} }
] ]