1
0
forked from xjboss/KCauldronX
This commit is contained in:
Prototik
2015-06-05 20:41:54 +07:00
parent 9c2057bf68
commit 7f699c1473
21 changed files with 398 additions and 42 deletions

View File

@ -1,14 +1,16 @@
--- ../src-base/minecraft/net/minecraft/entity/projectile/EntityFireball.java
+++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityFireball.java
@@ -3,6 +3,7 @@
@@ -2,7 +2,9 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -15,6 +16,8 @@
@@ -15,6 +17,8 @@
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
@ -17,7 +19,7 @@
public abstract class EntityFireball extends Entity
{
private int field_145795_e = -1;
@@ -28,6 +31,8 @@
@@ -28,6 +32,8 @@
public double accelerationX;
public double accelerationY;
public double accelerationZ;
@ -26,7 +28,7 @@
private static final String __OBFID = "CL_00001717";
public EntityFireball(World p_i1759_1_)
@@ -62,11 +67,19 @@
@@ -62,11 +68,19 @@
{
super(p_i1761_1_);
this.shootingEntity = p_i1761_2_;
@ -46,7 +48,7 @@
p_i1761_3_ += this.rand.nextGaussian() * 0.4D;
p_i1761_5_ += this.rand.nextGaussian() * 0.4D;
p_i1761_7_ += this.rand.nextGaussian() * 0.4D;
@@ -140,7 +153,7 @@
@@ -140,7 +154,7 @@
if (movingobjectposition1 != null)
{
@ -55,7 +57,7 @@
if (d1 < d0 || d0 == 0.0D)
{
@@ -159,6 +172,14 @@
@@ -159,6 +173,14 @@
if (movingobjectposition != null)
{
this.onImpact(movingobjectposition);
@ -70,7 +72,7 @@
}
this.posX += this.motionX;
@@ -227,6 +248,8 @@
@@ -227,6 +249,8 @@
p_70014_1_.setShort("zTile", (short)this.field_145794_g);
p_70014_1_.setByte("inTile", (byte)Block.getIdFromBlock(this.field_145796_h));
p_70014_1_.setByte("inGround", (byte)(this.inGround ? 1 : 0));
@ -79,7 +81,7 @@
p_70014_1_.setTag("direction", this.newDoubleNBTList(new double[] {this.motionX, this.motionY, this.motionZ}));
}
@@ -238,8 +261,17 @@
@@ -238,8 +262,17 @@
this.field_145796_h = Block.getBlockById(p_70037_1_.getByte("inTile") & 255);
this.inGround = p_70037_1_.getByte("inGround") == 1;
@ -98,7 +100,7 @@
NBTTagList nbttaglist = p_70037_1_.getTagList("direction", 6);
this.motionX = nbttaglist.func_150309_d(0);
this.motionY = nbttaglist.func_150309_d(1);
@@ -273,6 +305,13 @@
@@ -273,6 +306,13 @@
if (p_70097_1_.getEntity() != null)
{
@ -112,7 +114,7 @@
Vec3 vec3 = p_70097_1_.getEntity().getLookVec();
if (vec3 != null)
@@ -288,6 +327,7 @@
@@ -288,6 +328,7 @@
if (p_70097_1_.getEntity() instanceof EntityLivingBase)
{
this.shootingEntity = (EntityLivingBase)p_70097_1_.getEntity();
@ -120,3 +122,15 @@
}
return true;
@@ -315,4 +356,11 @@
{
return 15728880;
}
+
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ }
+ // Cauldron end
}