mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
7a6e6ec4ca
Upstream has released updates that appear to apply and compile correctly Paper Changes: 97b2eadf1 [Auto] Updated Upstream (CraftBukkit) 4c10f02d6 [Auto] Updated Upstream (Spigot) 8ab9dc066 Add API to get exact interaction point in PlayerInteractEvent (#4995) 0c74328e5 [CI-SKIP] Add a few missing commands to the ./paper help output
54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
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 392d27916b929881ff05f94325184acc6f0d7b7a..9c42b5df5839ed1759391270bcc6f240388ddd04 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockFireAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java
|
|
@@ -115,11 +115,7 @@ public abstract class BlockFireAbstract extends Block {
|
|
break;
|
|
}
|
|
}
|
|
- // Paper start - don't search for portal creation when looking down
|
|
- if(enumdirection == EnumDirection.DOWN || enumdirection == EnumDirection.UP) {
|
|
- return false;
|
|
- }
|
|
- // Paper end
|
|
+
|
|
return flag && BlockPortalShape.a((GeneratorAccess) world, blockposition, enumdirection.h().n()).isPresent();
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
|
|
index e3ba447eb7f3023406b71aab97e3d30523540588..83366996a0f9ae4684cc5424ace7630cc72b75f7 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 {
|
|
return EnumDirection.NORTH;
|
|
case EAST:
|
|
return EnumDirection.SOUTH;
|
|
+ // Purpur start
|
|
+ case UP:
|
|
+ return EnumDirection.UP;
|
|
+ case DOWN:
|
|
+ return EnumDirection.DOWN;
|
|
+ // Purpur end
|
|
default:
|
|
throw new IllegalStateException("Unable to get Y-rotated facing of " + this);
|
|
}
|
|
@@ -129,6 +135,12 @@ public enum EnumDirection implements INamable {
|
|
return EnumDirection.SOUTH;
|
|
case EAST:
|
|
return EnumDirection.NORTH;
|
|
+ // Purpur start
|
|
+ case UP:
|
|
+ return EnumDirection.UP;
|
|
+ case DOWN:
|
|
+ return EnumDirection.DOWN;
|
|
+ // Purpur end
|
|
default:
|
|
throw new IllegalStateException("Unable to get CCW facing of " + this);
|
|
}
|