Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit)

Browse Source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
95544a2da SPIGOT-6350: Fix wrong portal block place order
This commit is contained in:
Aikar 2021-05-02 05:07:27 -04:00
parent 6733d78753
commit 07a18c4579
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix nether portal creation
diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
index 60330f753fcbdef679a9444c3888f1656b2fa344..c22dbbfbe8b16d4c2f1df1f9efd3b06e330ac909 100644
index 133d0f85e95384fcec622db5b565b57b926c7e2d..37276ac5c5e9160e8703884a02f8d765ce6afc24 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
@@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
@ -19,4 +19,4 @@ index 60330f753fcbdef679a9444c3888f1656b2fa344..c22dbbfbe8b16d4c2f1df1f9efd3b06e
+ // Paper end
CraftBlockState state = CraftBlockState.getBlockState(world, position, flag);
state.setData(data);
list.put(position, state);
// remove first to keep insertion order

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 6f55b5b8883b1bd2a8661478e078be359fad1294
Subproject commit 95544a2da8707a3b3ee758e346da9ab063f1dbb2