twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Re-Implement BlockDamage

Browse Source
This commit is contained in:
Erik Broes
2011-03-23 16:38:42 +01:00
parent f33de669fb
commit 49043a8aff
3 changed files with 37 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minecraft/server/ItemInWorldManager.java
View File

@@ -2,6 +2,7 @@ package net.minecraft.server;
// CraftBukkit start
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.Event;
@@ -66,9 +67,21 @@ public class ItemInWorldManager {
if (event.useInteractedBlock() != Event.Result.DENY) {
Block.byId[l].b(this.b, i, j, k, this.a);
}
// CraftBukkit end
if (l > 0 && Block.byId[l].a(this.a) >= 1.0F) {
// Handle hitting a block
float toolDamage = Block.byId[l].a(this.a);
BlockDamageEvent blockEvent = CraftEventFactory.callBlockDamageEvent(this.a, i, j, k, this.a.inventory.b(), toolDamage >= 1.0f);
if (blockEvent.isCancelled()) {
return;
}
if (blockEvent.getInstaBreak()) {
toolDamage = 2.0f;
}
if (toolDamage >= 1.0F) {
// CraftBukkit end
this.d(i, j, k);
} else {
this.g = i;