Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6bf12bff7 Ensure POI removal occurs on the correct thread
6b3a6aefa Remove stale POIs
7cbd4ca19 Remove patch for not searching for portal creation when looking down (#5031)
This commit is contained in:
jmp
2021-01-09 11:54:56 -08:00
parent f74bcbd599
commit 9370140d7a
12 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0164-Fix-rotating-UP-DOWN-CW-and-CCW.patch
View File

@@ -5,7 +5,7 @@ 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..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644
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 {
@@ -21,19 +21,6 @@ index 392d27916b929881ff05f94325184acc6f0d7b7a..172e4b3eeecc3808a335b80bb44bc6be
if (!a(world)) {
return false;
} else {
@@ -115,11 +109,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