Skip to content

Commit 7abe0b9

Browse files
SamsuikSamsuik
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@056268e [ci skip] Correct javadoc for Weapon Component (#13096) PaperMC/Paper@a0ea729 Fix minimum tick time reporting and off thread reading PaperMC/Paper@ba2fb8c Update spark-paper dependency version (#13171) PaperMC/Paper@ce983d7 Misc fixes to tick reporting (#13174) PaperMC/Paper@9d95cd5 Use BUILD_STARTED_AT instead of Instant.now() for build timestamp (#13175) PaperMC/Paper@610f1d2 Update fill-gradle to v1.0.9 PaperMC/Paper@ffcb7b2 Update Parchment (#13177) PaperMC/Paper@c33a9ce Fix incorrect variable use in Entity#startRiding PaperMC/Paper@c710b66 Add MapPalette.getNearestColor (#13104) PaperMC/Paper@b57d641 Expose isReplaceable on BlockData (#13180) PaperMC/Paper@af1823d Reduce impact of tick time calculations (#13188) PaperMC/Paper@89ca94a [ci skip] Rebuild patches PaperMC/Paper@e5cc256 [ci skip] Update CONTRIBUTING.md for Gradle and Windows Docs (#13190) PaperMC/Paper@ab99393 Fix charged creeper explosions not dropping mob skulls (#13167)
1 parent 966bf92 commit 7abe0b9

31 files changed

+217
-217
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
22
version=1.21.10-R0.1-SNAPSHOT
33
mcVersion=1.21.10
44

5-
paperRef=fba780d6a2948d5a42030a80cf79cb49a8472456
5+
paperRef=ab99393c0707baedff2c57c43a359d416b09442d
66

77
org.gradle.jvmargs=-Xmx2G
88
org.gradle.vfs.watch=false

‎sakura-server/build.gradle.kts.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/paper-server/build.gradle.kts
22
+++ b/paper-server/build.gradle.kts
3-
@@ -15,6 +_,7 @@
3+
@@ -12,6 +_,7 @@
44
}
55

66
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
77
+val serverBrand = rootProject.name
88

99
dependencies {
10-
mache("io.papermc:mache:1.21.10+build.1")
11-
@@ -26,6 +_,17 @@
10+
mache("io.papermc:mache:1.21.10+build.4")
11+
@@ -23,6 +_,17 @@
1212
minecraftVersion = providers.gradleProperty("mcVersion")
1313
gitFilePatches = false
1414

@@ -26,7 +26,7 @@
2626
spigot {
2727
enabled = true
2828
buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
29-
@@ -107,7 +_,20 @@
29+
@@ -104,7 +_,20 @@
3030
}
3131
}
3232

@@ -48,7 +48,7 @@
4848
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
4949
extendsFrom(configurations.compileClasspath.get())
5050
}
51-
@@ -130,7 +_,7 @@
51+
@@ -127,7 +_,7 @@
5252
}
5353

5454
dependencies {
@@ -57,7 +57,7 @@
5757
implementation("ca.spottedleaf:concurrentutil:0.0.5")
5858
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
5959
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
60-
@@ -207,7 +_,7 @@
60+
@@ -204,7 +_,7 @@
6161
"Specification-Version" to project.version,
6262
"Specification-Vendor" to "Paper Team",
6363
"Brand-Id" to "papermc:paper",
@@ -66,7 +66,7 @@
6666
"Build-Number" to (build ?: ""),
6767
"Build-Time" to buildTime.toString(),
6868
"Git-Branch" to gitBranch,
69-
@@ -266,7 +_,7 @@
69+
@@ -263,7 +_,7 @@
7070
jvmArgumentProviders.add(provider)
7171
}
7272

‎sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Track block changes and level tick scheduler
55

66

77
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
8-
index 252fefa6e19b2109d1b228b62a900b038766fbdd..a854d5cbb4cb78795f40e4b2dd81aa773fd3978b 100644
8+
index cbba36914e41f230f7003539e9ddfba2d570641d..b4b177fd7732960a5cf528e110c8b7160165fad7 100644
99
--- a/net/minecraft/server/MinecraftServer.java
1010
+++ b/net/minecraft/server/MinecraftServer.java
11-
@@ -1809,6 +1809,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -1841,6 +1841,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212
profilerFiller.pop();
1313
profilerFiller.pop();
1414
serverLevel.explosionDensityCache.clear(); // Paper - Optimize explosions
@@ -17,7 +17,7 @@ index 252fefa6e19b2109d1b228b62a900b038766fbdd..a854d5cbb4cb78795f40e4b2dd81aa77
1717
this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
1818

1919
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
20-
index 24f43dd7d3ffa060409c96882c0416f59dc571cc..4b2ea3c99bcd5452840b26c2ba607a4f034ba367 100644
20+
index 33dfa05d391ed8e6281c733ca5050a58bb32febe..f8ea7e4536f6e0584c65ea9e20fe63f1cc343425 100644
2121
--- a/net/minecraft/world/level/Level.java
2222
+++ b/net/minecraft/world/level/Level.java
2323
@@ -829,6 +829,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -32,7 +32,7 @@ index 24f43dd7d3ffa060409c96882c0416f59dc571cc..4b2ea3c99bcd5452840b26c2ba607a4f
3232
protected Level(
3333
WritableLevelData levelData,
3434
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
35-
index 4dcec2e8a3120a3dfa078e8cf6857ba99ca01a2d..c7454fc77f7b269608edf6d6f3e39d9d96e037a0 100644
35+
index 50a091ab493a7fbc5c457cabd2e26abece5f708a..7d62bc664ec6d26a41571c78ec3229604ac625f5 100644
3636
--- a/net/minecraft/world/level/chunk/LevelChunk.java
3737
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
3838
@@ -136,6 +136,16 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
@@ -74,7 +74,7 @@ index 4dcec2e8a3120a3dfa078e8cf6857ba99ca01a2d..c7454fc77f7b269608edf6d6f3e39d9d
7474
state.onPlace(this.level, pos, blockState, flag1);
7575
}
7676
diff --git a/net/minecraft/world/level/chunk/LevelChunkSection.java b/net/minecraft/world/level/chunk/LevelChunkSection.java
77-
index 029d224557613b46f015785a5bbffe49a6f39ec6..512835828f65f496c730122091d9bd117ca5eb78 100644
77+
index d354fad5e9c9e4a16a52dbd8c7eb1f177a75f681..955f97ea45c7b980f0f2c4321d27050bec1eabe5 100644
7878
--- a/net/minecraft/world/level/chunk/LevelChunkSection.java
7979
+++ b/net/minecraft/world/level/chunk/LevelChunkSection.java
8080
@@ -43,6 +43,26 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.block_

‎sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Client Visibility Settings
55

66

77
diff --git a/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
8-
index 6987eeace609fbfba967922e558e09268e0f6d44..e45e2d6094620d761b624bfaf5dfbbed4d559858 100644
8+
index 33ca4c2110673dee34b66c8d05ee83c4df828f2e..af31a3b9d0308e84c675e570ca7229a6171a0b7b 100644
99
--- a/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
1010
+++ b/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
1111
@@ -31,7 +31,7 @@ public class ClientboundLevelChunkPacketData {
@@ -36,7 +36,7 @@ index 6987eeace609fbfba967922e558e09268e0f6d44..e45e2d6094620d761b624bfaf5dfbbed
3636
final CompoundTag tag;
3737

3838
diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
39-
index c151134781e5a02892b79401595e897eb1733e86..3757c436b7a181831eb6a362549c89f361e96868 100644
39+
index 07f44bb61487671dd7df4524e7c65e101a1fc5b5..cf2b2794a2979d206ae9348498e4d8fadc16bc66 100644
4040
--- a/net/minecraft/server/level/ChunkMap.java
4141
+++ b/net/minecraft/server/level/ChunkMap.java
4242
@@ -173,6 +173,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -109,7 +109,7 @@ index c151134781e5a02892b79401595e897eb1733e86..3757c436b7a181831eb6a362549c89f3
109109
if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
110110
flag = false;
111111
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
112-
index 88a296df6eeeb50c25f370ccab802a3277943d59..477c3436d6586a9fd9f0486bc8102808c15c5bae 100644
112+
index 0a470f95e6c5399b92bf06f3c37fe31d9667acea..ca98972697fe2961402bea4cfb0cf86ea80a92f0 100644
113113
--- a/net/minecraft/server/level/ServerLevel.java
114114
+++ b/net/minecraft/server/level/ServerLevel.java
115115
@@ -591,6 +591,22 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -166,7 +166,7 @@ index 88a296df6eeeb50c25f370ccab802a3277943d59..477c3436d6586a9fd9f0486bc8102808
166166
}
167167

168168
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
169-
index 25bb23d613d44986caa118ec6a624c9ce329afb1..adf7db8095404825c392bb6bd399f02345693e9e 100644
169+
index 23bbe6f4e6b0dcb0b72cfe5d05f7e104d77edfa5..fcf471510fc9ea2456f6368e3d821ee987235eb8 100644
170170
--- a/net/minecraft/server/level/ServerPlayer.java
171171
+++ b/net/minecraft/server/level/ServerPlayer.java
172172
@@ -473,6 +473,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -256,7 +256,7 @@ index c6db2c96db96453daaf49779f588f75f7c3d3d60..fd08d04c13a4064c658e0aad436b4883
256256
if (packet.isTerminal()) {
257257
this.close();
258258
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
259-
index 7f6cc8f111f6f5df311397a7e31e25fa2c93c685..877a53bb8d0ef0693c6c77f70fe63bc63664187e 100644
259+
index 466735e2ca2092e0f5638792b2697ee04d3c299e..9c1f76bf678f54fe057a7d799cfb4ad7639fda52 100644
260260
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
261261
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
262262
@@ -3221,6 +3221,7 @@ public class ServerGamePacketListenerImpl
@@ -268,7 +268,7 @@ index 7f6cc8f111f6f5df311397a7e31e25fa2c93c685..877a53bb8d0ef0693c6c77f70fe63bc6
268268
if (this.player.containerMenu != oldContainer) {
269269
this.player.containerMenu.resumeRemoteUpdates();
270270
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
271-
index 57f01bf4af29c6a5e0f80c272917cb6aa43855b9..9644382065aa9e3c611e62b3679f753ea5390e33 100644
271+
index 476a88f9f9e93b4b9cf64f9f5b331bea15e70018..e9c536a11e403e1c979e01d21bfd3d167e439903 100644
272272
--- a/net/minecraft/world/entity/Entity.java
273273
+++ b/net/minecraft/world/entity/Entity.java
274274
@@ -535,6 +535,10 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
@@ -280,27 +280,27 @@ index 57f01bf4af29c6a5e0f80c272917cb6aa43855b9..9644382065aa9e3c611e62b3679f753e
280280
+ public boolean isFallingBlock;
281281
+ // Sakura end - client visibility settings
282282

283-
public Entity(EntityType<?> entityType, Level level) {
284-
this.type = entityType;
283+
public Entity(EntityType<?> type, Level level) {
284+
this.type = type;
285285
diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java
286-
index 31e0739bc20096fa368f2b22bb45034a6fe1fe43..c7a930caa2264c9465baf61a0ed8a188119f28c8 100644
286+
index 7b67387d3bb66b1c8ab77e1805c9530a8f1ffa3c..8150b567c05d2c8e87f4b65d616d5c0c01bc2e19 100644
287287
--- a/net/minecraft/world/entity/item/FallingBlockEntity.java
288288
+++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
289289
@@ -79,6 +79,7 @@ public class FallingBlockEntity extends Entity {
290-
super(entityType, level);
290+
super(type, level);
291291
this.dropItem = level.sakuraConfig().cannons.sand.dropItems; // Sakura - configure falling blocks dropping items
292292
this.heightParity = level.sakuraConfig().cannons.mechanics.fallingBlockParity; // Sakura - configure cannon mechanics
293293
+ this.isFallingBlock = true; // Sakura - client visibility settings
294294
}
295295

296296
public FallingBlockEntity(Level level, double x, double y, double z, BlockState state) {
297297
diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
298-
index df5b6c6c06fc594c3d51e59bab59a625ac1e4bae..4d0bc49ce0868d7a5a1870be4e19eb08f3f31482 100644
298+
index 18162042ee54e54bc4539a7a01a1fc88cc9b3f3a..71071899443fdb02beb0321f271430c732178e26 100644
299299
--- a/net/minecraft/world/entity/item/PrimedTnt.java
300300
+++ b/net/minecraft/world/entity/item/PrimedTnt.java
301301
@@ -63,6 +63,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
302-
public PrimedTnt(EntityType<? extends PrimedTnt> entityType, Level level) {
303-
super(entityType, level);
302+
public PrimedTnt(EntityType<? extends PrimedTnt> type, Level level) {
303+
super(type, level);
304304
this.blocksBuilding = true;
305305
+ this.isPrimedTNT = true; // Sakura - client visibility settings
306306
}

‎sakura-server/minecraft-patches/features/0003-Load-Chunks-on-Movement.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ index 25ea504fa93f78b43237e1c79f8b5685a2aa6d7c..5395b3e0491f197ffea3910d3f172dcd
6262
private static TicketType register(String name, long timeout, int flags) {
6363
return Registry.register(BuiltInRegistries.TICKET_TYPE, name, new TicketType(timeout, flags));
6464
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
65-
index 9644382065aa9e3c611e62b3679f753ea5390e33..82f8f4bbadf569fd64d3babbb988ebcd7abe59b2 100644
65+
index e9c536a11e403e1c979e01d21bfd3d167e439903..e8f262dd220e07a8b70e931274535f3c474d24a4 100644
6666
--- a/net/minecraft/world/entity/Entity.java
6767
+++ b/net/minecraft/world/entity/Entity.java
6868
@@ -539,6 +539,19 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
@@ -83,8 +83,8 @@ index 9644382065aa9e3c611e62b3679f753ea5390e33..82f8f4bbadf569fd64d3babbb988ebcd
8383
+ }
8484
+ // Sakura end - load chunks on movement
8585

86-
public Entity(EntityType<?> entityType, Level level) {
87-
this.type = entityType;
86+
public Entity(EntityType<?> type, Level level) {
87+
this.type = type;
8888
@@ -1540,7 +1553,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
8989

9090
ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisionsForBlocksOrWorldBorder(
@@ -94,7 +94,7 @@ index 9644382065aa9e3c611e62b3679f753ea5390e33..82f8f4bbadf569fd64d3babbb988ebcd
9494
);
9595
potentialCollisionsBB.addAll(entityAABBs);
9696
final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB);
97-
@@ -5243,13 +5256,14 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
97+
@@ -5242,13 +5255,14 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
9898
@Override
9999
public boolean shouldBeSaved() {
100100
return (this.removalReason == null || this.removalReason.shouldSave())
@@ -111,7 +111,7 @@ index 9644382065aa9e3c611e62b3679f753ea5390e33..82f8f4bbadf569fd64d3babbb988ebcd
111111

112112
public boolean mayInteract(ServerLevel level, BlockPos pos) {
113113
diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java
114-
index c7a930caa2264c9465baf61a0ed8a188119f28c8..44f04d0a6b1a47fa152f955a22cc8b8f1d2b3348 100644
114+
index 8150b567c05d2c8e87f4b65d616d5c0c01bc2e19..d1f806f950707091d02788117c1f8cffe5b2de04 100644
115115
--- a/net/minecraft/world/entity/item/FallingBlockEntity.java
116116
+++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
117117
@@ -80,6 +80,7 @@ public class FallingBlockEntity extends Entity {
@@ -123,19 +123,19 @@ index c7a930caa2264c9465baf61a0ed8a188119f28c8..44f04d0a6b1a47fa152f955a22cc8b8f
123123

124124
public FallingBlockEntity(Level level, double x, double y, double z, BlockState state) {
125125
diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
126-
index 4d0bc49ce0868d7a5a1870be4e19eb08f3f31482..2572c0fe5fc6bd2f389569cdaa907a8b5203f5b4 100644
126+
index 71071899443fdb02beb0321f271430c732178e26..dd4e2419892a8879106eaaccbf406bec12bbd017 100644
127127
--- a/net/minecraft/world/entity/item/PrimedTnt.java
128128
+++ b/net/minecraft/world/entity/item/PrimedTnt.java
129129
@@ -64,6 +64,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
130-
super(entityType, level);
130+
super(type, level);
131131
this.blocksBuilding = true;
132132
this.isPrimedTNT = true; // Sakura - client visibility settings
133133
+ this.loadChunks = level.sakuraConfig().cannons.loadChunks; // Sakura - load chunks on movement
134134
}
135135

136136
public PrimedTnt(Level level, double x, double y, double z, @Nullable LivingEntity owner) {
137137
diff --git a/net/minecraft/world/level/chunk/ChunkAccess.java b/net/minecraft/world/level/chunk/ChunkAccess.java
138-
index 9889485b15501c1adf1a73bb4603d3477860482d..833048754d7f60ad7f528f38c7d34804e1bf5ee1 100644
138+
index 98b7e1e3b8592824c69a9647a82621755526c71a..6c997cb573a489f9ca0b7ffe278de5f66e667aa8 100644
139139
--- a/net/minecraft/world/level/chunk/ChunkAccess.java
140140
+++ b/net/minecraft/world/level/chunk/ChunkAccess.java
141141
@@ -137,6 +137,15 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh

‎sakura-server/minecraft-patches/features/0004-Slice-Packet-obfuscation-and-reduction.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,20 +153,20 @@ index 638432a2e6506d3db6a25c068a33eeafb13cf0d6..c386288e808e97c938f1909d81ebfa00
153153

154154
if (this.entity instanceof LivingEntity) {
155155
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
156-
index 82f8f4bbadf569fd64d3babbb988ebcd7abe59b2..f66cc3104a4d3f61833ef6fdae79ef4a480aa2dd 100644
156+
index e8f262dd220e07a8b70e931274535f3c474d24a4..a7139549066914b3bc318bc409b392645344b3c4 100644
157157
--- a/net/minecraft/world/entity/Entity.java
158158
+++ b/net/minecraft/world/entity/Entity.java
159-
@@ -3708,7 +3708,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
160-
this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
159+
@@ -3707,7 +3707,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
160+
this.entityData.markDirty(DATA_AIR_SUPPLY_ID);
161161
return;
162162
}
163-
- this.entityData.set(Entity.DATA_AIR_SUPPLY_ID, event.getAmount());
164-
+ this.entityData.set(Entity.DATA_AIR_SUPPLY_ID, event.getAmount(), getMaxAirSupply()); // Slice
163+
- this.entityData.set(DATA_AIR_SUPPLY_ID, event.getAmount());
164+
+ this.entityData.set(DATA_AIR_SUPPLY_ID, event.getAmount(), this.getMaxAirSupply()); // Slice - packet obfuscation and reduction
165165
// CraftBukkit end
166166
}
167167

168168
diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java
169-
index 44f04d0a6b1a47fa152f955a22cc8b8f1d2b3348..59aa539b7d830de48ff582b0da6fa17796b8c4b8 100644
169+
index d1f806f950707091d02788117c1f8cffe5b2de04..a4fd6b0a6762ce4d9e488f305dd2abe1e43edbd8 100644
170170
--- a/net/minecraft/world/entity/item/FallingBlockEntity.java
171171
+++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
172172
@@ -144,7 +144,7 @@ public class FallingBlockEntity extends Entity {
@@ -179,7 +179,7 @@ index 44f04d0a6b1a47fa152f955a22cc8b8f1d2b3348..59aa539b7d830de48ff582b0da6fa177
179179

180180
public BlockPos getStartPos() {
181181
diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
182-
index 2572c0fe5fc6bd2f389569cdaa907a8b5203f5b4..6797e16f973b11d168906dfce240c70db25bc6f0 100644
182+
index dd4e2419892a8879106eaaccbf406bec12bbd017..ef61333619d772a3acba6e2f6997655016b399f9 100644
183183
--- a/net/minecraft/world/entity/item/PrimedTnt.java
184184
+++ b/net/minecraft/world/entity/item/PrimedTnt.java
185185
@@ -228,7 +228,11 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -196,7 +196,7 @@ index 2572c0fe5fc6bd2f389569cdaa907a8b5203f5b4..6797e16f973b11d168906dfce240c70d
196196

197197
public int getFuse() {
198198
diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
199-
index e2d5426b6c88dd3fbc64864b8bbd9a39a3ffa4ee..4a8ec0354ccc81dea6dac795975b59895b00f07f 100644
199+
index 0d19e0c6d8a2a7a26dfb594a2cd8f1a533347690..5f214aaad020552d2db143a1f7a33e8c858731a0 100644
200200
--- a/net/minecraft/world/entity/player/Player.java
201201
+++ b/net/minecraft/world/entity/player/Player.java
202202
@@ -580,7 +580,7 @@ public abstract class Player extends Avatar implements ContainerUser {
@@ -207,4 +207,4 @@ index e2d5426b6c88dd3fbc64864b8bbd9a39a3ffa4ee..4a8ec0354ccc81dea6dac795975b5989
207207
+ this.entityData.set(DATA_SCORE_ID, score1 + score, 0); // Slice - packet obfuscation and reduction
208208
}
209209

210-
public void startAutoSpinAttack(int ticks, float damage, ItemStack itemStack) {
210+
public void startAutoSpinAttack(int ticks, float damageAmount, ItemStack stack) {

‎sakura-server/minecraft-patches/features/0005-Add-redstone-implementation-api.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add redstone implementation api
55

66

77
diff --git a/net/minecraft/world/level/block/RedStoneWireBlock.java b/net/minecraft/world/level/block/RedStoneWireBlock.java
8-
index 8268ac128d0a2dfb9eee9a46630862bdd04a747e..7390a21f7c6991d3fb62fda9e88bc9212159177b 100644
8+
index 052ca983df58329d513373e14a0ed726005edd9b..fc75ecd9f56526b213b348d1243834eb21abfc34 100644
99
--- a/net/minecraft/world/level/block/RedStoneWireBlock.java
1010
+++ b/net/minecraft/world/level/block/RedStoneWireBlock.java
1111
@@ -275,7 +275,7 @@ public class RedStoneWireBlock extends Block {
@@ -18,7 +18,7 @@ index 8268ac128d0a2dfb9eee9a46630862bdd04a747e..7390a21f7c6991d3fb62fda9e88bc921
1818
// when this is not null, it can be used to find the source pos, which the turbo uses
1919
// to find the direction of information flow
2020
@@ -348,7 +348,7 @@ public class RedStoneWireBlock extends Block {
21-
protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving) {
21+
protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean movedByPiston) {
2222
if (!oldState.is(state.getBlock()) && !level.isClientSide()) {
2323
// Paper start - optimize redstone - replace call to updatePowerStrength
2424
- if (level.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) {

0 commit comments

Comments
 (0)