mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 04:40:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Buffer fix

Browse Source
This commit is contained in:
Anuken 2019-09-24 22:25:49 -04:00
parent 03bb94da23
commit f1456190b5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@ -390,14 +390,14 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
Draw.color(); Draw.color();
font.setColor(color); font.setColor(color);
font.draw(name, x, y + nameHeight, 0, Align.center, false); font.draw(name, x, y + nameHeight, 0, Align.center, false);
}
if(isAdmin){ if(isAdmin){
float s = 3f; float s = 3f;
Draw.color(color.r * 0.5f, color.g * 0.5f, color.b * 0.5f, 1f); Draw.color(color.r * 0.5f, color.g * 0.5f, color.b * 0.5f, 1f);
Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1.5f, s, s); Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1.5f, s, s);
Draw.color(color); Draw.color(color);
Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1f, s, s); Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1f, s, s);
}
} }
if(Core.settings.getBool("playerchat") && ((textFadeTime > 0 && lastText != null) || isTyping)){ if(Core.settings.getBool("playerchat") && ((textFadeTime > 0 && lastText != null) || isTyping)){

4
core/src/io/anuke/mindustry/world/ItemBuffer.java
View File

@ -1,7 +1,6 @@
package io.anuke.mindustry.world; package io.anuke.mindustry.world;
import io.anuke.arc.util.Pack; import io.anuke.arc.util.*;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import java.io.*; import java.io.*;
@ -78,5 +77,6 @@ public class ItemBuffer{
buffer[i] = l; buffer[i] = l;
} }
} }
index = Math.min(index, length - 1);
} }
} }