mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
7f4c8f8715
Upstream has released updates that appear to apply and compile correctly Paper Changes: 7232d8f2a EntityLoadCrossbowEvent#shouldConsumeItem 4740bd6c8 Mark PlayerInventory#getItem as nullable bd9ace578 Add a config option to limit the number of entities of each type to load/save in a chunk (#4792) 6bafeb5a9 Move logic from last patch into correct place 9668118fd disable entity ticking flag after watchdog obliteration
54 lines
2.3 KiB
Diff
54 lines
2.3 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 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
|
|
--- 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);
|
|
}
|