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

Update to Minecraft 1.10

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-06-09 11:43:49 +10:00
parent 604d9373c0
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/EntityFireball.patch
View File

@@ -17,7 +17,7 @@
public EntityFireball(World world) {
super(world);
@@ -36,10 +40,17 @@
@@ -36,12 +40,19 @@
public EntityFireball(World world, EntityLiving entityliving, double d0, double d1, double d2) {
super(world);
this.shooter = entityliving;
@@ -25,7 +25,9 @@
this.setSize(1.0F, 1.0F);
this.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
this.setPosition(this.locX, this.locY, this.locZ);
this.motX = this.motY = this.motZ = 0.0D;
this.motX = 0.0D;
this.motY = 0.0D;
this.motZ = 0.0D;
+ // CraftBukkit start - Added setDirection method
+ this.setDirection(d0, d1, d2);
+ }
@@ -35,7 +37,7 @@
d0 += this.random.nextGaussian() * 0.4D;
d1 += this.random.nextGaussian() * 0.4D;
d2 += this.random.nextGaussian() * 0.4D;
@@ -83,6 +94,12 @@
@@ -85,6 +96,12 @@
if (movingobjectposition != null) {
this.a(movingobjectposition);
@@ -48,9 +50,9 @@
}
this.locX += this.motX;
@@ -187,6 +204,11 @@
@@ -191,6 +208,11 @@
} else {
this.ao();
this.ap();
if (damagesource.getEntity() != null) {
+ // CraftBukkit start
+ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
@@ -60,7 +62,7 @@
Vec3D vec3d = damagesource.getEntity().aB();
if (vec3d != null) {
@@ -200,6 +222,7 @@
@@ -204,6 +226,7 @@
if (damagesource.getEntity() instanceof EntityLiving) {
this.shooter = (EntityLiving) damagesource.getEntity();