Spigot / CraftBukkit / 963f4a5fc13

Commits

md_5 authored 963f4a5fc13 25 Dec 2018

Add PlayerItemDamageEvent

Tags

No tags

63db0445960

master

Download source

nms-patches/ItemStack.patch

Modified

-1
+--- a/net/minecraft/server/ItemStack.java
-2
++++ b/net/minecraft/server/ItemStack.java
--
+@@ -15,6 +15,22 @@
-+
+@@ -15,6 +15,24 @@
-4
+ import org.apache.logging.log4j.LogManager;
-5
+ import org.apache.logging.log4j.Logger;
-6
-7
++// CraftBukkit start
-8
++import com.mojang.datafixers.Dynamic;
-9
++import java.util.List;
-10
++import java.util.Map;
-11
++
-12
++import org.bukkit.Location;
-13
++import org.bukkit.TreeType;
-14
++import org.bukkit.block.BlockState;
-15
++import org.bukkit.craftbukkit.block.CraftBlock;
-16
++import org.bukkit.craftbukkit.block.CraftBlockState;
-+
++import org.bukkit.craftbukkit.inventory.CraftItemStack;
-18
++import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-19
++import org.bukkit.entity.Player;
-20
++import org.bukkit.event.block.BlockFertilizeEvent;
-+
++import org.bukkit.event.player.PlayerItemDamageEvent;
-22
++import org.bukkit.event.world.StructureGrowEvent;
-23
++// CraftBukkit end
-24
++
-25
+ public final class ItemStack {
-26
-27
+     private static final Logger c = LogManager.getLogger();
--
+@@ -49,25 +65,49 @@
-+
+@@ -49,25 +67,49 @@
-29
+         this.E();
-30
+     }
-31
-32
++    // Called to run this stack through the data converter to handle older storage methods and serialized items
-33
++    public void convertStack() {
-34
++        if (false && MinecraftServer.getServer() != null) { // Skip for now, causes more issues than it solves
-35
++            // Don't convert some things - both the old and new data values are valid
-36
++            // Conversion would make getting then impossible
-37
++            if (this.item == Blocks.PUMPKIN.getItem() || this.item == Blocks.GRASS.getItem() || this.item == Blocks.SNOW.getItem()) {
-38
++                return;
-71
+             this.setDamage(this.getDamage());
-72
+         }
-73
++    }
-74
-75
++    private ItemStack(NBTTagCompound nbttagcompound) {
-76
++        this.load(nbttagcompound);
-77
++        // CraftBukkit end
-78
+         this.E();
-79
+     }
-80
--
+@@ -97,7 +137,7 @@
-+
+@@ -97,7 +139,7 @@
-82
+         return this.h ? Items.AIR : this.item;
-83
+     }
-84
-85
+-    public EnumInteractionResult placeItem(ItemActionContext itemactioncontext) {
-86
++    public EnumInteractionResult placeItem(ItemActionContext itemactioncontext, EnumHand enumhand) { // CraftBukkit - add hand
-87
+         EntityHuman entityhuman = itemactioncontext.getEntity();
-88
+         BlockPosition blockposition = itemactioncontext.getClickPosition();
-89
+         ShapeDetectorBlock shapedetectorblock = new ShapeDetectorBlock(itemactioncontext.getWorld(), blockposition, false);
--
+@@ -105,12 +145,144 @@
-+
+@@ -105,12 +147,144 @@
-91
+         if (entityhuman != null && !entityhuman.abilities.mayBuild && !this.b(itemactioncontext.getWorld().F(), shapedetectorblock)) {
-92
+             return EnumInteractionResult.PASS;
-93
+         } else {
-94
++            // CraftBukkit start - handle all block place event logic here
-95
++            NBTTagCompound oldData = this.getTagClone();
-96
++            int oldCount = this.getCount();
-97
++            World world = itemactioncontext.getWorld();
-98
++
-99
++            if (!(this.getItem() instanceof ItemBucket)) { // if not bucket
-100
++                world.captureBlockStates = true;
-226
++
-227
++                    entityhuman.b(StatisticList.ITEM_USED.b(item));
-228
++                }
-229
+             }
-230
++            world.capturedTileEntities.clear();
-231
++            world.capturedBlockStates.clear();
-232
++            // CraftBukkit end
-233
-234
+             return enuminteractionresult;
-235
+         }
--
+@@ -134,7 +306,7 @@
-+
+@@ -134,7 +308,7 @@
-237
+         nbttagcompound.setString("id", minecraftkey == null ? "minecraft:air" : minecraftkey.toString());
-238
+         nbttagcompound.setByte("Count", (byte) this.count);
-239
+         if (this.tag != null) {
-240
+-            nbttagcompound.set("tag", this.tag);
-241
++            nbttagcompound.set("tag", this.tag.clone()); // CraftBukkit - make defensive copy, data is going to another thread
-242
+         }
-243
-244
+         return nbttagcompound;
--
+@@ -212,6 +384,11 @@
-+
+@@ -191,6 +365,21 @@
-+
+                 }
-+
-+
+                 i -= k;
-+
++                // CraftBukkit start
-+
++                if (entityplayer != null) {
-+
++                    PlayerItemDamageEvent event = new PlayerItemDamageEvent(entityplayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), i);
-+
++                    event.getPlayer().getServer().getPluginManager().callEvent(event);
 +
-+
++                    if (i != event.getDamage() || event.isCancelled()) {
-+
++                        event.getPlayer().updateInventory();
-+
++                    }
-+
++                    if (event.isCancelled()) {
-+
++                        return false;
-+
++                    }
 +
-+
++                    i = event.getDamage();
-+
++                }
-+
++                // CraftBukkit end
-+
+                 if (i <= 0) {
-+
+                     return false;
-+
+                 }
-+
+@@ -212,6 +401,11 @@
-268
+                 if (this.isDamaged(i, entityliving.getRandom(), entityliving instanceof EntityPlayer ? (EntityPlayer) entityliving : null)) {
-269
+                     entityliving.c(this);
-270
+                     Item item = this.getItem();
-271
++                    // CraftBukkit start - Check for item breaking
-272
++                    if (this.count == 1 && entityliving instanceof EntityHuman) {
-273
++                        org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) entityliving, this);
-274
++                    }
-275
++                    // CraftBukkit end
-276
-277
+                     this.subtract(1);
-278
+                     if (entityliving instanceof EntityHuman) {
--
+@@ -335,6 +512,17 @@
-+
+@@ -335,6 +529,17 @@
-280
+         return this.tag;
-281
+     }
-282
-283
++    // CraftBukkit start
-284
++    @Nullable
-285
++    private NBTTagCompound getTagClone() {
-286
++        return this.tag == null ? null : this.tag.clone();
-287
++    }
-288
++
-289
++    private void setTagClone(@Nullable NBTTagCompound nbtttagcompound) {
-290
++        this.setTag(nbtttagcompound == null ? null : nbtttagcompound.clone());
-291
++    }
-292
++    // CraftBukkit end
-293
++
-294
+     public NBTTagCompound getOrCreateTag() {
-295
+         if (this.tag == null) {
-296
+             this.setTag(new NBTTagCompound());
--
+@@ -479,6 +667,14 @@
-+
+@@ -479,6 +684,14 @@
-298
+     }
-299
-300
+     public void setRepairCost(int i) {
-301
++        // CraftBukkit start - remove RepairCost tag when 0 (SPIGOT-3945)
-302
++        if (i == 0) {
-303
++            if (this.hasTag()) {
-304
++                this.tag.remove("RepairCost");
-305
++            }
-306
++            return;
-307
++        }
-308
++        // CraftBukkit end
-309
+         this.getOrCreateTag().setInt("RepairCost", i);
-310
+     }
-311
--
+@@ -521,6 +717,13 @@
-+
+@@ -521,6 +734,13 @@
-313
+         nbttaglist.add((NBTBase) nbttagcompound);
-314
+     }
-315
-316
++    // CraftBukkit start
-317
++    @Deprecated
-318
++    public void setItem(Item item) {
-319
++        this.item = item;
-320
++    }
-321
++    // CraftBukkit end
-322
++

CraftBukkit

Commits

Jira Issues

Add shortcut