From a5b1239c2b66e1d4c4d73383c7847d535359f1f3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 28 Sep 2020 18:32:39 -0400
Subject: [PATCH] Method renaming for consistency

---
 core/src/mindustry/editor/EditorTile.java           | 2 +-
 core/src/mindustry/io/SaveVersion.java              | 2 +-
 core/src/mindustry/io/legacy/LegacySaveVersion.java | 2 +-
 core/src/mindustry/world/Block.java                 | 2 +-
 core/src/mindustry/world/CachedTile.java            | 2 +-
 core/src/mindustry/world/Tile.java                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java
index 1098e463d3..9b0b199e76 100644
--- a/core/src/mindustry/editor/EditorTile.java
+++ b/core/src/mindustry/editor/EditorTile.java
@@ -112,7 +112,7 @@ public class EditorTile extends Tile{
         
         Block block = block();
 
-        if(block.hasEntity()){
+        if(block.hasBuilding()){
             build = entityprov.get().init(this, team, false, rotation);
             build.cons = new ConsumeModule(build);
             if(block.hasItems) build.items = new ItemModule();
diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
index c3f83b30d8..cacac7700a 100644
--- a/core/src/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -257,7 +257,7 @@ public abstract class SaveVersion extends SaveFileReader{
 
                 if(hadEntity){
                     if(isCenter){ //only read entity for center blocks
-                        if(block.hasEntity()){
+                        if(block.hasBuilding()){
                             try{
                                 readChunk(stream, true, in -> {
                                     byte revision = in.readByte();
diff --git a/core/src/mindustry/io/legacy/LegacySaveVersion.java b/core/src/mindustry/io/legacy/LegacySaveVersion.java
index cd8302d16d..7e84526bec 100644
--- a/core/src/mindustry/io/legacy/LegacySaveVersion.java
+++ b/core/src/mindustry/io/legacy/LegacySaveVersion.java
@@ -61,7 +61,7 @@ public abstract class LegacySaveVersion extends SaveVersion{
                     tile.setBlock(block);
                 }
 
-                if(block.hasEntity()){
+                if(block.hasBuilding()){
                     try{
                         readChunk(stream, true, in -> {
                             byte version = in.readByte();
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index a8d32bcc19..1d5241e1f5 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -499,7 +499,7 @@ public class Block extends UnlockableContent{
         return variantRegions;
     }
 
-    public boolean hasEntity(){
+    public boolean hasBuilding(){
         return destructible || update;
     }
 
diff --git a/core/src/mindustry/world/CachedTile.java b/core/src/mindustry/world/CachedTile.java
index 7e25c78b3b..3c14ade132 100644
--- a/core/src/mindustry/world/CachedTile.java
+++ b/core/src/mindustry/world/CachedTile.java
@@ -26,7 +26,7 @@ public class CachedTile extends Tile{
 
         Block block = block();
 
-        if(block.hasEntity()){
+        if(block.hasBuilding()){
             Building n = entityprov.get();
             n.cons(new ConsumeModule(build));
             n.tile(this);
diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java
index f3b4526ad8..63f08d6de4 100644
--- a/core/src/mindustry/world/Tile.java
+++ b/core/src/mindustry/world/Tile.java
@@ -508,7 +508,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
             }
         }
 
-        if(block.hasEntity()){
+        if(block.hasBuilding()){
             build = entityprov.get().init(this, team, block.update && !state.isEditor(), rotation);
         }
     }