From e43c693411d24b8e12967d75a264157615184d86 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Sun, 13 Oct 2019 03:05:27 -0300
Subject: [PATCH] fixes in 1.15

---
 src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java | 2 +-
 src/main/java/carpet/script/bundled/FileModule.java      | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java b/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java
index 91bfc51c..c4faff2c 100644
--- a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java
+++ b/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java
@@ -65,7 +65,7 @@ public abstract class FlatChunkGeneratorMixin extends ChunkGenerator<FlatChunkGe
                     return Feature.NETHER_BRIDGE.getMonsterSpawns();
                 }
     
-                if (Feature.NETHER_BRIDGE.isApproximatelyInsideStructure(this.world, pos) && this.world.getBlockState(pos.down()).getBlock() == Blocks.NETHER_BRICKS)
+                if (Feature.NETHER_BRIDGE.isApproximatelyInsideStructure(this.world, pos) && this.world.getBlockState(pos.down(1)).getBlock() == Blocks.NETHER_BRICKS)
                 {
                     return Feature.NETHER_BRIDGE.getMonsterSpawns();
                 }
diff --git a/src/main/java/carpet/script/bundled/FileModule.java b/src/main/java/carpet/script/bundled/FileModule.java
index b9d45b22..6623c417 100644
--- a/src/main/java/carpet/script/bundled/FileModule.java
+++ b/src/main/java/carpet/script/bundled/FileModule.java
@@ -1,9 +1,9 @@
 package carpet.script.bundled;
 
 import carpet.CarpetServer;
-import net.minecraft.nbt.EndTag;
 import net.minecraft.nbt.PositionTracker;
 import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.TagReaders;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -63,14 +63,12 @@ public class FileModule implements ModuleInterface
             byte byte_1 = dataInput_1.readByte();
             if (byte_1 == 0)
             {
-                return new EndTag();
+                return null;
             }
             else
             {
                 dataInput_1.readUTF();
-                Tag tag_1 = Tag.createTag(byte_1);
-                tag_1.read(dataInput_1, 0, PositionTracker.DEFAULT);
-                return tag_1;
+                return TagReaders.of(byte_1).read(dataInput_1, 0, PositionTracker.DEFAULT);
             }
         }
         catch (IOException ignored)