mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ci skip] (Mostly) finish adding identifying patch comments

Browse source
This commit is contained in:
Nassim Jahnke 2024-01-24 11:45:17 +01:00
parent 76da4bc683
commit 11645e3268
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
167 changed files with 521 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/server/0748-Expand-FallingBlock-API.patch
View file

@ -13,7 +13,7 @@ public net.minecraft.world.entity.item.FallingBlockEntity blockState
Co-authored-by: Lukas Planz <lukas.planz@web.de>
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index bfd8304f4fc2aded1681c7a59cf9d81192e5a3b2..a75e48f27cd8fbf6165c96c5df09671494eb9dd8 100644
index 2452c7f0a3ed1faf9b90351bea3389382c677d05..9daf8aa557d9f4fdbcc138a47892ea5a061dd877 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -66,6 +66,7 @@ public class FallingBlockEntity extends Entity {
@ -24,7 +24,7 @@ index bfd8304f4fc2aded1681c7a59cf9d81192e5a3b2..a75e48f27cd8fbf6165c96c5df096714
public FallingBlockEntity(EntityType<? extends FallingBlockEntity> type, Level world) {
super(type, world);
@@ -180,7 +181,7 @@ public class FallingBlockEntity extends Entity {
@@ -178,7 +179,7 @@ public class FallingBlockEntity extends Entity {
}
if (!this.onGround() && !flag1) {
@ -33,7 +33,7 @@ index bfd8304f4fc2aded1681c7a59cf9d81192e5a3b2..a75e48f27cd8fbf6165c96c5df096714
if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
this.spawnAtLocation((ItemLike) block);
}
@@ -328,6 +329,7 @@ public class FallingBlockEntity extends Entity {
@@ -326,6 +327,7 @@ public class FallingBlockEntity extends Entity {
}
nbt.putBoolean("CancelDrop", this.cancelDrop);
@ -41,10 +41,10 @@ index bfd8304f4fc2aded1681c7a59cf9d81192e5a3b2..a75e48f27cd8fbf6165c96c5df096714
}
@Override
@@ -363,6 +365,11 @@ public class FallingBlockEntity extends Entity {
this.setOrigin(new org.bukkit.Location(this.level().getWorld(), srcX, srcY, srcZ));
@@ -353,6 +355,11 @@ public class FallingBlockEntity extends Entity {
this.blockState = Blocks.SAND.defaultBlockState();
}
// Paper end
+ // Paper start - Expand FallingBlock API
+ if (nbt.contains("Paper.AutoExpire")) {
+ this.autoExpire = nbt.getBoolean("Paper.AutoExpire");