Fixed extra space in uCore dependency
This commit is contained in:
@@ -359,12 +359,12 @@ public class NetServer extends Module{
|
||||
}
|
||||
}
|
||||
|
||||
//write group ID + group sizeif(((SyncTrait)entity).isSyncing())
|
||||
//write group ID + group size
|
||||
dataStream.writeByte(group.getID());
|
||||
dataStream.writeShort(amount);
|
||||
|
||||
for(Entity entity : group.all()){
|
||||
if(!((SyncTrait)entity).isSyncing()) continue;;
|
||||
if(!((SyncTrait)entity).isSyncing()) continue;
|
||||
|
||||
int position = syncStream.position();
|
||||
//write all entities now
|
||||
|
||||
@@ -650,7 +650,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
|
||||
@Override
|
||||
public void write(DataOutput buffer) throws IOException {
|
||||
super.writeSave(buffer, !isLocal);
|
||||
buffer.writeUTF(name);
|
||||
buffer.writeUTF(name); //TODO writing strings is very inefficient
|
||||
buffer.writeBoolean(isAdmin);
|
||||
buffer.writeInt(Color.rgba8888(color));
|
||||
buffer.writeBoolean(dead);
|
||||
|
||||
@@ -74,7 +74,7 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
|
||||
public Bullet(){}
|
||||
|
||||
public boolean collidesTiles(){
|
||||
return true; //TODO make artillery and such not do this
|
||||
return type.collidesTiles; //TODO make artillery and such not do this
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -25,6 +25,8 @@ public abstract class BulletType extends BaseBulletType<Bullet> implements Conte
|
||||
public float armorPierce = 0f;
|
||||
/**Whether to sync this bullet to clients.*/
|
||||
public boolean syncable;
|
||||
/**Whether this bullet type collides with tiles.*/
|
||||
public boolean collidesTiles;
|
||||
|
||||
public BulletType(float speed, float damage){
|
||||
this.id = lastid ++;
|
||||
|
||||
@@ -12,7 +12,7 @@ import static io.anuke.mindustry.Vars.threads;
|
||||
|
||||
public interface SyncTrait extends Entity, TypeTrait {
|
||||
|
||||
/**Whether smoothing of entities is enabled; not yet implemented.*/
|
||||
/**Whether smoothing of entities is enabled when using multithreading; not yet implemented.*/
|
||||
static boolean isSmoothing(){
|
||||
return threads.isEnabled() && threads.getFPS() <= Gdx.graphics.getFramesPerSecond() / 2f;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user