Updated arc

This commit is contained in:
Anuken
2020-02-03 20:30:18 -05:00
parent ea6490cf9f
commit 67106abb9b
8 changed files with 9 additions and 10 deletions

View File

@@ -125,7 +125,7 @@ public class EntityGroup<T extends Entity> implements Iterable<T>{
entitiesToAdd.clear(); entitiesToAdd.clear();
for(T e : entitiesToRemove){ for(T e : entitiesToRemove){
entityArray.removeValue(e, true); entityArray.remove(e, true);
if(map != null){ if(map != null){
map.remove(e.getID()); map.remove(e.getID());
} }
@@ -148,7 +148,7 @@ public class EntityGroup<T extends Entity> implements Iterable<T>{
}else{ //maybe it's being queued? }else{ //maybe it's being queued?
for(T check : entitiesToAdd){ for(T check : entitiesToAdd){
if(check.getID() == id){ //if it is indeed queued, remove it if(check.getID() == id){ //if it is indeed queued, remove it
entitiesToAdd.removeValue(check, true); entitiesToAdd.remove(check, true);
if(removeListener != null){ if(removeListener != null){
removeListener.get(check); removeListener.get(check);
} }

View File

@@ -28,8 +28,7 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{
private Position to; private Position to;
private Runnable done; private Runnable done;
public ItemTransfer(){ public ItemTransfer(){}
}
@Remote(called = Loc.server, unreliable = true) @Remote(called = Loc.server, unreliable = true)
public static void transferItemEffect(Item item, float x, float y, Unit to){ public static void transferItemEffect(Item item, float x, float y, Unit to){

View File

@@ -204,7 +204,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
other.block().onProximityUpdate(other); other.block().onProximityUpdate(other);
if(other.entity != null){ if(other.entity != null){
other.entity.proximity.removeValue(tile, true); other.entity.proximity.remove(tile, true);
} }
} }
} }

View File

@@ -311,7 +311,7 @@ public class Saves{
public void delete(){ public void delete(){
file.delete(); file.delete();
saves.removeValue(this, true); saves.remove(this, true);
if(this == current){ if(this == current){
current = null; current = null;
} }

View File

@@ -156,7 +156,7 @@ public class MobileInput extends InputHandler implements GestureListener{
} }
void removeRequest(BuildRequest request){ void removeRequest(BuildRequest request){
selectRequests.removeValue(request, true); selectRequests.remove(request, true);
if(!request.breaking){ if(!request.breaking){
removals.add(request); removals.add(request);
} }

View File

@@ -190,7 +190,7 @@ public class Administration{
} }
} }
bannedIPs.removeValue(ip, false); bannedIPs.remove(ip, false);
if(found){ if(found){
save(); save();

View File

@@ -157,7 +157,7 @@ public class JoinDialog extends FloatingDialog{
inner.addImageButton(Icon.trash, Styles.emptyi, () -> { inner.addImageButton(Icon.trash, Styles.emptyi, () -> {
ui.showConfirm("$confirm", "$server.delete", () -> { ui.showConfirm("$confirm", "$server.delete", () -> {
servers.removeValue(server, true); servers.remove(server, true);
saveServers(); saveServers();
setupRemote(); setupRemote();
refreshRemote(); refreshRemote();

View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=45ffc0ea35fa7c282538259daf247eabfc987acf archash=1817bb22ac7680700fe780816940f4217a1f7e07