Forestry conflict. #16

ToroCraft · May 5, 2017 · 6bc031d · 6bc031d
1 parent 1c6e2d1
commit 6bc031d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.11.2-23"
+version = "1.11.2-24"
 group= "net.torocraft.teletoro"
 archivesBaseName = "teletoro"
 

diff --git a/java/net/torocraft/teletoro/TeleToro.java b/java/net/torocraft/teletoro/TeleToro.java
@@ -14,7 +14,7 @@
 public class TeleToro {
 
 	public static final String MODID = "teletoro";
-	public static final String VERSION = "1.11.2-23";
+	public static final String VERSION = "1.11.2-24";
 	public static final String MODNAME = "TeleToro";
 
 	@SidedProxy(clientSide = "net.torocraft.teletoro.ClientProxy", serverSide = "net.torocraft.teletoro.ServerProxy")

diff --git a/java/net/torocraft/teletoro/Teletory.java b/java/net/torocraft/teletoro/Teletory.java
@@ -126,7 +126,7 @@ public void limitBuildHeight(PlaceEvent event) {
 			return;
 		}
 
-		if (event.getBlockSnapshot().getPos().getY() > TeletoryWorldProvider.HEIGHT) {
+		if (event.getBlockSnapshot().getPos().getY() > 32) {
 			event.getPlayer().sendMessage(new TextComponentString("max build height"));
 			event.setCanceled(true);
 		}

diff --git a/java/net/torocraft/teletoro/world/TeletoryWorldProvider.java b/java/net/torocraft/teletoro/world/TeletoryWorldProvider.java
@@ -32,18 +32,6 @@ public DimensionType getDimensionType() {
 		return Teletory.TYPE;
 	}
 
-	public static final int HEIGHT = 32;
-
-	@Override
-	public int getActualHeight() {
-		return HEIGHT;
-	}
-
-	@Override
-	public int getHeight() {
-		return HEIGHT;
-	}
-
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Vec3d getFogColor(float par1, float par2) {