SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.9

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-01 08:32:46 +11:00
parent 2da480a9c8
commit 21d4bf5d1f
305 changed files with 6684 additions and 6105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
paper-server/nms-patches/EntityEnderPearl.patch
View File

@@ -11,11 +11,11 @@
+
public class EntityEnderPearl extends EntityProjectile {
private EntityLiving c;
@@ -33,21 +39,35 @@
private EntityLiving d;
@@ -51,13 +57,35 @@
EntityPlayer entityplayer = (EntityPlayer) entityliving;
if (entityplayer.playerConnection.a().g() && entityplayer.world == this.world && !entityplayer.isSleeping()) {
if (entityplayer.playerConnection.a().isConnected() && entityplayer.world == this.world && !entityplayer.isSleeping()) {
- if (this.random.nextFloat() < 0.05F && this.world.getGameRules().getBoolean("doMobSpawning")) {
- EntityEndermite entityendermite = new EntityEndermite(this.world);
-
@@ -40,8 +40,8 @@
+ this.world.addEntity(entityendermite);
+ }
+
+ if (entityliving.au()) {
+ entityliving.mount((Entity) null);
+ if (entityliving.isPassenger()) {
+ entityliving.stopRiding();
+ }
+
+ entityplayer.playerConnection.teleport(teleEvent.getTo());
@@ -50,15 +50,7 @@
+ entityliving.damageEntity(DamageSource.FALL, 5.0F);
+ CraftEventFactory.entityDamage = null;
}
-
- if (entityliving.au()) {
- entityliving.mount((Entity) null);
- }
-
- entityliving.enderTeleportTo(this.locX, this.locY, this.locZ);
- entityliving.fallDistance = 0.0F;
- entityliving.damageEntity(DamageSource.FALL, 5.0F);
+ // CraftBukkit end
}
} else if (entityliving != null) {
entityliving.enderTeleportTo(this.locX, this.locY, this.locZ);
if (entityliving.isPassenger()) {
this.stopRiding();