<commit_before>--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java	0000-00-00 00:00:00.000000000 -0000
@@ -6,6 +6,10 @@
 
 import java.util.*;
 
+import net.minecraft.src.forge.ArmorProperties;
+import net.minecraft.src.forge.ISpecialArmor;
+import net.minecraft.src.forge.ForgeHooks;
+
 // Referenced classes of package net.minecraft.src:
 //            EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, 
 //            ContainerPlayer, World, ChunkCoordinates, DataWatcher, 
@@ -493,6 +497,8 @@
         worldObj.entityJoinedWorld(entityitem);
     }
 
+    /* FORGE: This isnt called anymore
+     */
     public float getCurrentPlayerStrVsBlock(Block block)
     {
         float f = inventory.getStrVsBlock(block);
@@ -521,6 +527,45 @@
         return f1;
     }
 
+    /* FORGE: Extended to allow metadata.
+     */
+    public float getCurrentPlayerStrVsBlock(Block block, int md)
+    {
+        float f = 1.0F;
+        ItemStack ist = inventory.getCurrentItem();
+        if(ist != null)
+        {
+        	f = ist.getItem().getStrVsBlock(ist, block, md);
+        }
+        
+        int i = EnchantmentHelper.func_40630_b(inventory);
+        if (i > 0 && ForgeHooks.canHarvestBlock(block, this, md))
+        {
+        	f += i * i + 1;
+        }
+        
+        if(func_35184_a(Potion.digSpeed))
+        {
+            f *= 1.0F + (float)(func_35187_b(Potion.digSpeed).getAmplifier() + 1) * 0.2F;
+        }
+        
+        if(func_35184_a(Potion.digSlowdown))
+        {
+            f *= 1.0F - (float)(func_35187_b(Potion.digSlowdown).getAmplifier() + 1) * 0.2F;
+        }
+        
+        if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.func_40632_g(inventory))
+        {
+            f /= 5F;
+        }
+        
+        if(!onGround)
+        {
+            f /= 5F;
+        }
+        return f;
+    }
+
     public boolean canHarvestBlock(Block block)
     {
         return inventory.canHarvestBlock(block);
@@ -718,7 +763,26 @@
     }
 
     protected void damageEntity(DamageSource damagesource, int i)
-    {
+    {        
+        boolean doRegularComputation = true;<commit_msg>Missed some mappings<commit_after>--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java	0000-00-00 00:00:00.000000000 -0000
@@ -6,6 +6,10 @@
 
 import java.util.*;
 
+import net.minecraft.src.forge.ArmorProperties;
+import net.minecraft.src.forge.ISpecialArmor;
+import net.minecraft.src.forge.ForgeHooks;
+
 // Referenced classes of package net.minecraft.src:
 //            EntityLiving, InventoryPlayer, FoodStats, PlayerCapabilities, 
 //            ContainerPlayer, World, ChunkCoordinates, DataWatcher, 
@@ -493,6 +497,8 @@
         worldObj.entityJoinedWorld(entityitem);
     }
 
+    /* FORGE: This isnt called anymore
+     */
     public float getCurrentPlayerStrVsBlock(Block block)
     {
         float f = inventory.getStrVsBlock(block);
@@ -521,6 +527,45 @@
         return f1;
     }
 
+    /* FORGE: Extended to allow metadata.
+     */
+    public float getCurrentPlayerStrVsBlock(Block block, int md)
+    {
+        float f = 1.0F;
+        ItemStack ist = inventory.getCurrentItem();
+        if(ist != null)
+        {
+        	f = ist.getItem().getStrVsBlock(ist, block, md);
+        }
+        
+        int i = EnchantmentHelper.getEfficiencyModifier(inventory);
+        if (i > 0 && ForgeHooks.canHarvestBlock(block, this, md))
+        {
+        	f += i * i + 1;
+        }
+        
+        if(func_35184_a(Potion.digSpeed))
+        {
+            f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F;
+        }
+        
+        if(func_35184_a(Potion.digSlowdown))
+        {
+            f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F;
+        }
+        
+        if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory))
+        {
+            f /= 5F;
+        }
+        
+        if(!onGround)
+        {
+            f /= 5F;
+        }
+        return f;
+    }
+
     public boolean canHarvestBlock(Block block)
     {
         return inventory.canHarvestBlock(block);
@@ -718,7 +763,26 @@
     }
 
     protected void damageEntity(DamageSource damagesource, int i)
-    {
+    {        
+        boolean doRegularComputation = true;
{'fraction_non_alphanumeric': 0.14039677349029867, 'fraction_numerical': 0.05319380858949204, 'mean_word_length': 2.1532646048109965, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 5, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 4, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '420132', 'n_tokens_mistral': 1751, 'n_tokens_neox': 1560, 'n_words': 251}