From 8e9adeb4b44b195317c11cf0fe8a2e3a5d789624 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 12 Jul 2018 14:06:50 -0400
Subject: [PATCH] Fixed web version bugs

---
 build.gradle                                           |  2 +-
 .../io/anuke/mindustry/graphics/MinimapRenderer.java   |  1 -
 core/src/io/anuke/mindustry/io/Maps.java               |  4 ++--
 .../io/anuke/mindustry/world/blocks/BuildBlock.java    |  2 +-
 html/src/io/anuke/mindustry/client/HtmlLauncher.java   | 10 ++++++++++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 63cf126d57..8939f41ed4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
         aiVersion = '1.8.1'
-        uCoreVersion = '05f51b183e'
+        uCoreVersion = 'c502931313'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
index c3a13df75e..096c4455a7 100644
--- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
@@ -121,7 +121,6 @@ public class MinimapRenderer implements Disposable{
         int color = colorFor(world.tile(tile.x, tile.y));
         pixmap.drawPixel(tile.x, pixmap.getHeight() - 1 - tile.y, color);
 
-        texture.bind();
         Pixmaps.drawPixel(texture, tile.x, pixmap.getHeight() - 1 - tile.y, color);
     }
 
diff --git a/core/src/io/anuke/mindustry/io/Maps.java b/core/src/io/anuke/mindustry/io/Maps.java
index e8aa937786..5ea9e0bf38 100644
--- a/core/src/io/anuke/mindustry/io/Maps.java
+++ b/core/src/io/anuke/mindustry/io/Maps.java
@@ -166,7 +166,7 @@ public class Maps implements Disposable{
 
             for(String name : customMapNames){
                 try{
-                    String data = Settings.getString("map-data-" + name);
+                    String data = Settings.getString("map-data-" + name, "");
                     byte[] bytes = Base64Coder.decode(data);
                     loadMap(name, () -> new ByteArrayInputStream(bytes), true);
                 }catch (Exception e){
@@ -182,7 +182,7 @@ public class Maps implements Disposable{
 		if(!gwt){
 			return customMapDirectory.child(name + "." + mapExtension)::read;
 		}else{
-			String data = Settings.getString("map-data-" + name);
+			String data = Settings.getString("map-data-" + name, "");
 			byte[] bytes = Base64Coder.decode(data);
 			return () -> new ByteArrayInputStream(bytes);
 		}
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 3e30dbedc4..810049b4b6 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -70,7 +70,7 @@ public class BuildBlock extends Block {
 
     @Override
     public void setBars(){
-        bars.replace(new BlockBar(BarType.health, true, tile -> (float)tile.<BuildEntity>entity().progress));
+        bars.replace(new BlockBar(BarType.health, true, tile -> tile.<BuildEntity>entity().progress));
     }
 
     @Override
diff --git a/html/src/io/anuke/mindustry/client/HtmlLauncher.java b/html/src/io/anuke/mindustry/client/HtmlLauncher.java
index 35b1ea0748..208e24b976 100644
--- a/html/src/io/anuke/mindustry/client/HtmlLauncher.java
+++ b/html/src/io/anuke/mindustry/client/HtmlLauncher.java
@@ -218,6 +218,16 @@ public class HtmlLauncher extends GwtApplication {
             public InputStream read() {
                 return stream;
             }
+
+            @Override
+            public String nameWithoutExtension() {
+                return "unknown";
+            }
+
+            @Override
+            public String name() {
+                return "unknown";
+            }
         });
     }
 }