twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update for 1.6.5

Browse Source
This commit is contained in:
Erik Broes
2011-05-28 22:50:08 +02:00
committed by EvilSeph
parent 9ec5d8b5df
commit 6dbd710bbf
41 changed files with 747 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraft/server/EntityFireball.java
View File

@@ -51,8 +51,8 @@ public class EntityFireball extends Entity {
this.e = d2 / d3 * 0.1D;
}
public void p_() {
super.p_();
public void o_() {
super.o_();
this.fireTicks = 10;
if (this.a > 0) {
--this.a;
@@ -97,7 +97,7 @@ public class EntityFireball extends Entity {
for (int j = 0; j < list.size(); ++j) {
Entity entity1 = (Entity) list.get(j);
if (entity1.o_() && (entity1 != this.shooter || this.l >= 25)) {
if (entity1.n_() && (entity1 != this.shooter || this.l >= 25)) {
float f = 0.3F;
AxisAlignedBB axisalignedbb = entity1.boundingBox.b((double) f, (double) f, (double) f);
MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1);
@@ -191,7 +191,7 @@ public class EntityFireball extends Entity {
this.yaw = this.lastYaw + (this.yaw - this.lastYaw) * 0.2F;
float f2 = 0.95F;
if (this.aa()) {
if (this.ac()) {
for (int k = 0; k < 4; ++k) {
float f3 = 0.25F;
@@ -229,14 +229,14 @@ public class EntityFireball extends Entity {
this.j = nbttagcompound.c("inGround") == 1;
}
public boolean o_() {
public boolean n_() {
return true;
}
public boolean damageEntity(Entity entity, int i) {
this.ac();
this.ae();
if (entity != null) {
Vec3D vec3d = entity.W();
Vec3D vec3d = entity.Y();
if (vec3d != null) {
this.motX = vec3d.a;