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

16
paper-server/nms-patches/net/minecraft/world/item/ItemSnowball.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/ItemSnowball.java
+++ b/net/minecraft/world/item/ItemSnowball.java
@@ -19,19 +19,32 @@
@@ -22,17 +22,25 @@
public InteractionResultWrapper<ItemStack> use(World world, EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
@@ -14,9 +14,7 @@
entitysnowball.shootFromRotation(entityhuman, entityhuman.getXRot(), entityhuman.getYRot(), 0.0F, 1.5F, 1.0F);
- world.addFreshEntity(entitysnowball);
+ if (world.addFreshEntity(entitysnowball)) {
+ if (!entityhuman.getAbilities().instabuild) {
+ itemstack.shrink(1);
+ }
+ itemstack.consume(1, entityhuman);
+
+ world.playSound((EntityHuman) null, entityhuman.getX(), entityhuman.getY(), entityhuman.getZ(), SoundEffects.SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
+ } else if (entityhuman instanceof net.minecraft.server.level.EntityPlayer) {
@@ -26,12 +24,8 @@
+ // CraftBukkit end
entityhuman.awardStat(StatisticList.ITEM_USED.get(this));
+ // CraftBukkit start - moved up
+ /*
if (!entityhuman.getAbilities().instabuild) {
itemstack.shrink(1);
}
+ */
- itemstack.consume(1, entityhuman);
+ // itemstack.consume(1, entityhuman); // CraftBukkit - moved up
return InteractionResultWrapper.sidedSuccess(itemstack, world.isClientSide());
}