Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting the Drop API for now, we need to re-evalute this as it is causing too many issues and blocking releases.

Browse Source 
This reverts commits:
- d2d03afc8854394aeefb40ea5ebf224c8032b19f
- 6245746e91123dd8ef70e5f15b7cdfc7e36d8e8c
- 41fae5c613e9e69a8f6bdf33b23bb09d7f407433
- c34bdecab42cf4098054a5ea43e1c2958d44ae92
- d7445084ac9a90fa0b66d8b050b8d0d2a062eaf3
- 6a6ed2e6ae2328a8a791bcc6857c44dc6c6a7030
- a783bc4dc95da8e26c673abe48fad96b550aba28
- cb50fd68766df8e07631ba5be85759f8257e8068
- 34dfff2ad5c407c712b2783f02960aac5e8649f2
- f33b513820de987b49a4338e85df80968217a601
- 5fd9fdfde055e6eb6a83db246d009b69377b7c94
- 2795b116f40d06551fbb7b96d1963c0ddbeac384
This commit is contained in:
Warren Loo
2012-03-27 11:37:00 -04:00
parent c16bf07e85
commit c100e20d60
23 changed files with 65 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package net.minecraft.server;
// CraftBukkit start
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.Event;
@@ -202,24 +203,37 @@ public class ItemInWorldManager {
}
public boolean breakBlock(int i, int j, int k) {
int l = this.world.getTypeId(i, j, k);
int i1 = this.world.getData(i, j, k);
// CraftBukkit start
if (player instanceof EntityPlayer) {
if(CraftEventFactory.callBlockBreakEvent(this.world, i, j, k, l, i1, this.isCreative(), this.player)) {
if (this.player instanceof EntityPlayer) {
org.bukkit.block.Block block = this.world.getWorld().getBlockAt(i, j, k);
// Tell client the block is gone immediately then process events
if (world.getTileEntity(i, j, k) == null) {
Packet53BlockChange packet = new Packet53BlockChange(i, j, k, this.world);
packet.material = 0;
packet.data = 0;
((EntityPlayer) this.player).netServerHandler.sendPacket(packet);
}
BlockBreakEvent event = new BlockBreakEvent(block, (org.bukkit.entity.Player) this.player.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
// Let the client know the block still exists
((EntityPlayer) this.player).netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, this.world));
return false;
}
}
// CraftBukkit end
int l = this.world.getTypeId(i, j, k);
int i1 = this.world.getData(i, j, k);
this.world.a(this.player, 2001, i, j, k, l + (this.world.getData(i, j, k) << 12));
boolean flag = this.b(i, j, k);
if (this.isCreative()) {
// CraftBukkit start - honour additions to drop list
Block.byId[l].doActualDrop(this.world, i, j, k);
// CraftBukkit end
((EntityPlayer) this.player).netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, this.world));
} else {
ItemStack itemstack = this.player.U();