Update to 1.16.5

This commit is contained in:
BillyGalbreath
2021-01-15 21:03:49 -06:00
parent 22b876a304
commit ba42138259
68 changed files with 124 additions and 140 deletions

View File

@@ -4,25 +4,8 @@ Date: Wed, 6 Jan 2021 02:19:29 -0600
Subject: [PATCH] Fix rotating UP/DOWN CW and CCW
diff --git a/src/main/java/net/minecraft/server/BlockFireAbstract.java b/src/main/java/net/minecraft/server/BlockFireAbstract.java
index 9c42b5df5839ed1759391270bcc6f240388ddd04..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644
--- a/src/main/java/net/minecraft/server/BlockFireAbstract.java
+++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java
@@ -93,12 +93,6 @@ public abstract class BlockFireAbstract extends Block {
}
private static boolean b(World world, BlockPosition blockposition, EnumDirection enumdirection) {
- // CraftBukkit start - SPIGOT-6311: Do not calculate portals for up/down directions
- if (enumdirection == EnumDirection.UP || enumdirection == EnumDirection.DOWN) {
- return false;
- }
- // CraftBukkit end
-
if (!a(world)) {
return false;
} else {
diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
index e3ba447eb7f3023406b71aab97e3d30523540588..83366996a0f9ae4684cc5424ace7630cc72b75f7 100644
index c187f04ef657e9012d2fcdc2fd5b4cca69d78c3f..a660033af081cef69e4646c9ed9eaa66cf90217f 100644
--- a/src/main/java/net/minecraft/server/EnumDirection.java
+++ b/src/main/java/net/minecraft/server/EnumDirection.java
@@ -113,6 +113,12 @@ public enum EnumDirection implements INamable {