SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch
View File

@@ -31,7 +31,7 @@
return entityfallingblock;
}
@@ -121,7 +133,7 @@
@@ -126,7 +138,7 @@
@Override
public void tick() {
if (this.blockState.isAir()) {
@@ -40,7 +40,7 @@
} else {
Block block = this.blockState.getBlock();
@@ -152,7 +164,7 @@
@@ -154,7 +166,7 @@
this.spawnAtLocation((IMaterial) block);
}
@@ -49,7 +49,7 @@
}
} else {
IBlockData iblockdata = this.level().getBlockState(blockposition);
@@ -169,9 +181,15 @@
@@ -171,9 +183,15 @@
this.blockState = (IBlockData) this.blockState.setValue(BlockProperties.WATERLOGGED, true);
}
@@ -66,7 +66,7 @@
if (block instanceof Fallable) {
((Fallable) block).onLand(this.level(), blockposition, this.blockState, iblockdata, this);
}
@@ -199,19 +217,19 @@
@@ -201,19 +219,19 @@
}
}
} else if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {

20
paper-server/nms-patches/net/minecraft/world/entity/item/EntityItem.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/item/EntityItem.java
+++ b/net/minecraft/world/entity/item/EntityItem.java
@@ -31,6 +31,15 @@
@@ -33,6 +33,15 @@
import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.phys.Vec3D;
@@ -16,7 +16,7 @@
public class EntityItem extends Entity implements TraceableEntity {
private static final DataWatcherObject<ItemStack> DATA_ITEM = DataWatcher.defineId(EntityItem.class, DataWatcherRegistry.ITEM_STACK);
@@ -47,6 +56,7 @@
@@ -51,6 +60,7 @@
@Nullable
public UUID target;
public final float bobOffs;
@@ -24,7 +24,7 @@
public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
super(entitytypes, world);
@@ -125,12 +135,15 @@
@@ -132,12 +142,15 @@
@Override
public void tick() {
if (this.getItem().isEmpty()) {
@@ -44,7 +44,7 @@
this.xo = this.getX();
this.yo = this.getY();
@@ -180,9 +193,11 @@
@@ -186,9 +199,11 @@
this.mergeWithNeighbours();
}
@@ -56,7 +56,7 @@
this.hasImpulse |= this.updateInWaterStateAndDoFluidPushing();
if (!this.level().isClientSide) {
@@ -194,7 +209,13 @@
@@ -200,7 +215,13 @@
}
if (!this.level().isClientSide && this.age >= 6000) {
@@ -71,7 +71,7 @@
}
}
@@ -277,11 +298,16 @@
@@ -283,11 +304,16 @@
}
private static void merge(EntityItem entityitem, ItemStack itemstack, EntityItem entityitem1, ItemStack itemstack1) {
@@ -89,7 +89,7 @@
}
}
@@ -302,12 +328,17 @@
@@ -308,12 +334,17 @@
} else if (this.level().isClientSide) {
return true;
} else {
@@ -108,16 +108,16 @@
}
return true;
@@ -354,7 +385,7 @@
@@ -365,7 +396,7 @@
}
this.setItem(ItemStack.of(nbttagcompound1));
if (this.getItem().isEmpty()) {
- this.discard();
+ this.discard(null); // CraftBukkit - add Bukkit remove cause
}
}
@@ -366,10 +397,50 @@
@@ -377,10 +408,50 @@
Item item = itemstack.getItem();
int i = itemstack.getCount();

4
paper-server/nms-patches/net/minecraft/world/entity/item/EntityTNTPrimed.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/item/EntityTNTPrimed.java
+++ b/net/minecraft/world/entity/item/EntityTNTPrimed.java
@@ -19,6 +19,12 @@
@@ -17,6 +17,12 @@
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.IBlockData;
@@ -13,7 +13,7 @@
public class EntityTNTPrimed extends Entity implements TraceableEntity {
private static final DataWatcherObject<Integer> DATA_FUSE_ID = DataWatcher.defineId(EntityTNTPrimed.class, DataWatcherRegistry.INT);
@@ -28,6 +34,8 @@
@@ -26,6 +32,8 @@
public static final String TAG_FUSE = "fuse";
@Nullable
public EntityLiving owner;