tc

[chemicraft/ChemiCraftNext.git] / common / pcc / chemicraft / item / ItemRadiationGun.java

diff --git a/common/pcc/chemicraft/item/ItemRadiationGun.java b/common/pcc/chemicraft/item/ItemRadiationGun.java
index 887fd5a..56a477e 100644 (file)
--- a/common/pcc/chemicraft/item/ItemRadiationGun.java
+++ b/common/pcc/chemicraft/item/ItemRadiationGun.java
@@ -56,7 +56,7 @@ public class ItemRadiationGun extends Item {
                                                        par3EntityPlayer.posY,
                                                        par3EntityPlayer.posZ,
                                                        "ChemiCraft.raditionGun",
-                                                       1.0F,
+                                                       2.0F,
                                                        1.3F,
                                                        false);
                                        if (!par2World.isRemote) {
@@ -77,7 +77,7 @@ public class ItemRadiationGun extends Item {
                                                par3EntityPlayer.posY,
                                                par3EntityPlayer.posZ,
                                                "ChemiCraft.raditionGun",
-                                               1.0F,
+                                               2.0F,
                                                1.3F,
                                                false);
                                if (!par2World.isRemote) {
@@ -92,7 +92,7 @@ public class ItemRadiationGun extends Item {
        private void field_00001(ItemStack par1ItemStack, World par2World,
                        EntityPlayer par3EntityPlayer) {
 
-               ArrayList<Entity> collisions = ChemiCraft.instance.mathAuxiliary.getTriangleEntitys(par2World,
+               ArrayList<Entity> collisions = ChemiCraft.instance.mathAuxiliary.getTriangleEntitysByPlayer(par2World,
                                par3EntityPlayer.posX,
                                par3EntityPlayer.posY,
                                par3EntityPlayer.posZ,
@@ -102,7 +102,7 @@ public class ItemRadiationGun extends Item {
                                15);
 
                for (int i = 0; i < collisions.size(); i++) {
-                       if (collisions.get(i) instanceof EntityLiving) {
+                       if (collisions.get(i) instanceof EntityLiving && collisions.get(i) != par3EntityPlayer) {
                                try {
                                        EntityLiving entity = (EntityLiving) collisions.get(i);
                                        entity.attackEntityFrom(DamageSource.causePlayerDamage(par3EntityPlayer), (int) (10 + Math.random() * 11));