core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0340-MC-136865-Use-valid-it...

35 lines
1.9 KiB
Diff
Raw Normal View History

Update Upstream
2019-05-06 02:58:04 +00:00
From c79457837608a93dc4a9977a48002dc2808cd783 Mon Sep 17 00:00:00 2001
MC-136865: Pass original itemstack for enchantment checks on block break When an itemstack runs out of durability, the amount is reduced to 0 which then marks the item as invalid. This causes the last unit of durability to not apply enchantments as the enchantment level check sees the item as a dud. keep the clone of the item used to a non empty value so it represents the item used.
2018-11-01 21:53:43 +00:00
From: MisterVector <whizkid3000@hotmail.com>
Date: Thu, 1 Nov 2018 14:50:05 -0700
Optimize Small Entity Movement Optimizes small movements by entities by merging the movement into the entities next larger movement, until enough movement velocity has been hit. This reduces collision detection and able to reduce movement cpu cost by 5-7%. The default option of 0.75 seems to provide all the gains without any noticable behavior change to entity movement. We have to exclude slimes due to weird jumping animation bugs.
2018-11-02 00:05:18 +00:00
Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
break
MC-136865: Pass original itemstack for enchantment checks on block break When an itemstack runs out of durability, the amount is reduced to 0 which then marks the item as invalid. This causes the last unit of durability to not apply enchantments as the enchantment level check sees the item as a dud. keep the clone of the item used to a non empty value so it represents the item used.
2018-11-01 21:53:43 +00:00
When an itemstack runs out of durability, the amount is reduced to
0 which then marks the item as invalid. This causes the last unit
of durability to not apply enchantments as the enchantment level
check sees the item as a dud.
keep the clone of the item used to a non empty value so it represents
the item used.
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
Update Upstream
2019-05-06 02:58:04 +00:00
index f692da609b..5bc8bd7cdc 100644
MC-136865: Pass original itemstack for enchantment checks on block break When an itemstack runs out of durability, the amount is reduced to 0 which then marks the item as invalid. This causes the last unit of durability to not apply enchantments as the enchantment level check sees the item as a dud. keep the clone of the item used to a non empty value so it represents the item used.
2018-11-01 21:53:43 +00:00
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
more 1.14 stuffs yay!
2019-05-05 11:12:32 +00:00
@@ -354,10 +354,11 @@ public class PlayerInteractManager {
Don't merge player movements (fixes block breaking issues) Fixes #1640
2018-11-03 04:18:10 +00:00
ItemStack itemstack1 = this.player.getItemInMainHand();
boolean flag1 = this.player.hasBlock(iblockdata);
Use empty itemstack, not null in PlayerInteractManager Introduced in 00a41bca428163d87c7ac33bfc37d0d83d264913 Fixes GH-1642
2018-11-03 08:50:42 +00:00
+ ItemStack itemstack2 = flag && flag1 && event.isDropItems() && !itemstack1.isEmpty() ? itemstack1.cloneItemStack() : ItemStack.a; // Paper - MC-136865 - clone before use
MC-136865: Pass original itemstack for enchantment checks on block break When an itemstack runs out of durability, the amount is reduced to 0 which then marks the item as invalid. This causes the last unit of durability to not apply enchantments as the enchantment level check sees the item as a dud. keep the clone of the item used to a non empty value so it represents the item used.
2018-11-01 21:53:43 +00:00
itemstack1.a(this.world, iblockdata, blockposition, this.player);
// CraftBukkit start - Check if block should drop items
if (flag && flag1 && event.isDropItems()) {
- ItemStack itemstack2 = itemstack1.isEmpty() ? ItemStack.a : itemstack1.cloneItemStack();
Don't merge player movements (fixes block breaking issues) Fixes #1640
2018-11-03 04:18:10 +00:00
+ //ItemStack itemstack2 = itemstack1.isEmpty() ? ItemStack.a : itemstack1.cloneItemStack(); // Paper - MC-136865 - move up
MC-136865: Pass original itemstack for enchantment checks on block break When an itemstack runs out of durability, the amount is reduced to 0 which then marks the item as invalid. This causes the last unit of durability to not apply enchantments as the enchantment level check sees the item as a dud. keep the clone of the item used to a non empty value so it represents the item used.
2018-11-01 21:53:43 +00:00
iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
}
--
Correct patches
2019-05-05 11:32:20 +00:00
2.21.0
MC-136865: Pass original itemstack for enchantment checks on block break When an itemstack runs out of durability, the amount is reduced to 0 which then marks the item as invalid. This causes the last unit of durability to not apply enchantments as the enchantment level check sees the item as a dud. keep the clone of the item used to a non empty value so it represents the item used.
2018-11-01 21:53:43 +00:00