Merge pull request #524 from Nukepowered/fakeplayer_fix

Resolved FakePlayer NPE
magmafoundation · Mar 22, 2022 · 38a5824 · 38a5824
2 parents 97900ca + 6c165e3
commit 38a5824
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/org/bukkit/craftbukkit/v1_12_R1/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/event/CraftEventFactory.java
@@ -1212,13 +1212,12 @@ public static boolean handleBlockFormEvent(World world, BlockPos pos, IBlockStat
     }
 
     // Cauldron start
-    public static BlockBreakEvent callBlockBreakEvent(net.minecraft.world.World world, BlockPos pos, IBlockState iBlockState, net.minecraft.entity.player.EntityPlayerMP player) {
+    public static BlockBreakEvent callBlockBreakEvent(net.minecraft.world.World world, BlockPos pos, IBlockState iBlockState, EntityPlayerMP player) {
         org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-        org.bukkit.event.block.BlockBreakEvent blockBreakEvent = new org.bukkit.event.block.BlockBreakEvent(bukkitBlock, Bukkit.getPlayer(player.getUniqueID()));
-        EntityPlayerMP playermp = (EntityPlayerMP) player;
+        org.bukkit.event.block.BlockBreakEvent blockBreakEvent = new org.bukkit.event.block.BlockBreakEvent(bukkitBlock, player.getBukkitEntity());
         net.minecraft.block.Block block = iBlockState.getBlock();
-        if (!(playermp instanceof FakePlayer)) {
-            boolean isSwordNoBreak = playermp.interactionManager.getGameType().isCreative() && !playermp.getHeldItemMainhand().isEmpty() && playermp.getHeldItemMainhand().getItem() instanceof ItemSword;
+        if (!(player instanceof FakePlayer)) {
+            boolean isSwordNoBreak = player.interactionManager.getGameType().isCreative() && !player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ItemSword;
             if (!isSwordNoBreak) {
                 int exp = 0;
                 if (!(block == null || !player.canHarvestBlock(block.getDefaultState()) || block.canSilkHarvest(world, pos, block.getBlockState().getBaseState(), player) && EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, player.getHeldItemMainhand()) > 0)) {