Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2562124 [ci skip] Create SECURITY.md (#11331)
PaperMC/Paper@e01ddf4 Fixup porting issue in vanillaBiomeProvider impl (#11185)
PaperMC/Paper@509ea2f Fix horse armor desync (#11341)
PaperMC/Paper@2f0891e Fix InventoryOpenEvent cancellation (#11304)
PaperMC/Paper@227c94a Fix inventory desync when placing blocks with spawn protection (#11090)
PaperMC/Paper@b483da4 Update Alternate Current to v1.9 (#11333)
  • Loading branch information
Samsuik committed Sep 2, 2024
1 parent b7e6fbe commit 47b54e6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group=me.samsuik.sakura
version=1.21.1-R0.1-SNAPSHOT
mcVersion=1.21.1

paperRef=e08e6679fcaf5ce8b91db628309ed530e58a4133
paperRef=b483da4e026ad078c9b1dd6e1e5ec25ac450df69

org.gradle.jvmargs=-Xmx2G
org.gradle.vfs.watch=false
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0004-Local-Config-and-Value-Storage-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,10 @@ index 7da2fc17f6e7bf888ef0c2a8eba0fc3b4c10436e..c811bc64d0686fdec58defb707d57e53
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ffd284f0e25c6f20672f7225aafd37e6c87ccf03..f07bdac9a26ce669346e87f7faf70d1fcb25c71b 100644
index 90d4834f97d3ba996d46493246b1947511553424..a132b4e10b0c6d0818bd406dcf93d317f0a0774a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -246,6 +246,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -256,6 +256,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
// Paper end

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0077-Optimise-hopper-ticking.patch
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ index 5db5ba026462ca642dcee718af732f80fadabef5..51e26395b53628b34b1f7f68935a9ba4

boolean isEmpty();
diff --git a/src/main/java/net/minecraft/world/level/block/HopperBlock.java b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
index 86e5617d445ce762aa374e236a0ccdfe5901fce5..a22bd0b6d8a33a9af0b27085a7eb22be16b57046 100644
index 3e1c7d62c24dd48a805260d156135dc4f0c3d1fc..ced5fb075349a9b944708aeaabe82b3350ac5d4d 100644
--- a/src/main/java/net/minecraft/world/level/block/HopperBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
@@ -145,6 +145,12 @@ public class HopperBlock extends BaseEntityBlock {
@@ -144,6 +144,12 @@ public class HopperBlock extends BaseEntityBlock {
private void checkPoweredState(Level world, BlockPos pos, BlockState state) {
boolean bl = !world.hasNeighborSignal(pos);
if (bl != state.getValue(ENABLED)) {
Expand Down

0 comments on commit 47b54e6

Please sign in to comment.