mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
Fix blocks being placed in adventure mode. Closes #6085
Add early error for setting invalid world directory. Closes #6084 Fix PlayerTickEvent not firing when dead, even if player isn't removed from world yet. Closes #6074 Fix PlayerDestroyItemEvent not firing for some cases. Closes #6067
This commit is contained in:
1 parent
1ab40e0b3f
commit
7deb479676
5 files changed
+57
-46
No files matched your search
@@ -583,6 +583,10 @@ public class ForgeHooks
|
||||
ItemStack itemstack = context.getItem();
|
||||
World world = context.getWorld();
|
||||
|
||||
PlayerEntity player = context.getPlayer();
|
||||
if (player != null && !player.abilities.allowEdit && !itemstack.canPlaceOn(world.getTags(), new CachedBlockInfo(world, context.getPos(), false)))
|
||||
return ActionResultType.PASS;
|
||||
|
||||
// handle all placement events here
|
||||
int size = itemstack.getCount();
|
||||
CompoundNBT nbt = null;
|
||||
@@ -596,7 +600,11 @@ public class ForgeHooks
|
||||
world.captureBlockSnapshots = true;
|
||||
}
|
||||
|
||||
ItemStack copy = itemstack.isDamageable() ? itemstack.copy() : null;
|
||||
ActionResultType ret = itemstack.getItem().onItemUse(context);
|
||||
if (itemstack.isEmpty())
|
||||
ForgeEventFactory.onPlayerDestroyItem(player, copy, context.getHand());
|
||||
|
||||
world.captureBlockSnapshots = false;
|
||||
|
||||
if (ret == ActionResultType.SUCCESS)
|
||||
@@ -616,7 +624,6 @@ public class ForgeHooks
|
||||
itemstack.setCount(size);
|
||||
itemstack.setTag(nbt);
|
||||
|
||||
PlayerEntity player = context.getPlayer();
|
||||
Direction side = context.getFace();
|
||||
|
||||
boolean eventResult = false;
|
||||
|
||||
Reference in new issue
Block a user