This commit is contained in:
fewizz committed 2015-12-28 18:31:36 +03:00
1 parent bcc6623337
commit bb33f0b7d2
3 files changed
+4 -20

No files matched your search

@@ -4,7 +4,7 @@ public class ModInformation {
public static final String name = "Electro-Magic Tools";
public static final String modid = "EMT";
public static final String version = "1.2.4";
public static final String version = "1.2.5";
public static final String texturePath = "electromagictools";
public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory";
public static final String clientProxy = "tombenpotter.emt.proxy.ClientProxy";
@@ -72,7 +72,7 @@ public class EntityShield extends Entity {
owner = this.worldObj.getPlayerEntityByName(dataWatcher.getWatchableObjectString(11));
needCheck = false;
}
else if(!needCheck && owner == null){
if(!needCheck && owner == null){
this.setDead();
return;
}
@@ -94,23 +94,7 @@ public class EntityShield extends Entity {
if (entity.riddenByEntity != this && entity.ridingEntity != this) {
double ePosX = entity.posX - this.posX;
double ePosZ = entity.posZ - this.posZ;
double d2 = MathHelper.abs_max(ePosX, ePosZ);
d2 = (double) MathHelper.sqrt_double(d2);
ePosX /= d2;
ePosZ /= d2;
double d3 = 1.0D / d2;
if (d3 > 1.0D) {
d3 = 1.0D;
}
ePosX *= d3;
ePosZ *= d3;
ePosX *= 0.05000000074505806D;
ePosZ *= 0.05000000074505806D;
ePosX *= (double) (1.0F - this.entityCollisionReduction);
ePosZ *= (double) (1.0F - this.entityCollisionReduction);
entity.addVelocity(ePosX * 10, 0.0D, ePosZ * 10);
entity.addVelocity(ePosX / 5D, 0.0D, ePosZ / 5D);
}
}