diff --git a/patches/minecraft/net/minecraft/block/BlockBed.java.patch b/patches/minecraft/net/minecraft/block/BlockBed.java.patch index 3c998966e4..76a727fd78 100644 --- a/patches/minecraft/net/minecraft/block/BlockBed.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockBed.java.patch @@ -5,9 +5,9 @@ } - if (p_196250_2_.field_73011_w.func_76567_e() && p_196250_2_.func_180494_b(p_196250_3_) != Biomes.field_76778_j) { -+ net.minecraft.world.dimension.Dimension.SleepResult sleepResult = p_196250_2_.field_73011_w.canSleepAt(p_196250_4_, p_196250_3_); -+ if (sleepResult != net.minecraft.world.dimension.Dimension.SleepResult.BED_EXPLODES) { -+ if (sleepResult == net.minecraft.world.dimension.Dimension.SleepResult.DENY) return true; ++ net.minecraftforge.common.extensions.IForgeDimension.SleepResult sleepResult = p_196250_2_.field_73011_w.canSleepAt(p_196250_4_, p_196250_3_); ++ if (sleepResult != net.minecraftforge.common.extensions.IForgeDimension.SleepResult.BED_EXPLODES) { ++ if (sleepResult == net.minecraftforge.common.extensions.IForgeDimension.SleepResult.DENY) return true; if (p_196250_1_.func_177229_b(field_176471_b)) { EntityPlayer entityplayer = this.func_176470_e(p_196250_2_, p_196250_3_); if (entityplayer != null) { diff --git a/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch index a5e028eac3..5dc5ce6ff6 100644 --- a/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch @@ -55,7 +55,7 @@ } private Chunk func_75823_a(IWorld p_75823_1_, NBTTagCompound p_75823_2_) { -@@ -511,12 +532,16 @@ +@@ -511,6 +532,10 @@ chunk.func_177427_f(true); } @@ -66,13 +66,6 @@ return chunk; } - private void func_199814_a(NBTTagCompound p_199814_1_, Chunk p_199814_2_) { - NBTTagList nbttaglist = p_199814_1_.func_150295_c("Entities", 10); -- World world = p_199814_2_.func_177412_p(); -+ World world = p_199814_2_.getWorld(); - - for(int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.func_150305_b(i); @@ -813,4 +838,8 @@ return flag;