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

Update to Minecraft 1.16.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,8 @@
public class EntityEnderPearl extends EntityProjectileThrowable {
@@ -65,21 +71,35 @@
EntityPlayer entityplayer = (EntityPlayer) entityliving;
@@ -37,21 +43,35 @@
EntityPlayer entityplayer = (EntityPlayer) entity;
if (entityplayer.playerConnection.a().isConnected() && entityplayer.world == this.world && !entityplayer.isSleeping()) {
- if (this.random.nextFloat() < 0.05F && this.world.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING)) {
@@ -34,29 +34,29 @@
- entityendermite.setPlayerSpawned(true);
+ entityendermite.setPlayerSpawned(true);
entityendermite.setPositionRotation(entityliving.locX(), entityliving.locY(), entityliving.locZ(), entityliving.yaw, entityliving.pitch);
entityendermite.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
- this.world.addEntity(entityendermite);
- }
+ this.world.addEntity(entityendermite, CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
+ }
- if (entityliving.isPassenger()) {
- entityliving.stopRiding();
+ if (entityliving.isPassenger()) {
+ entityliving.stopRiding();
- if (entity.isPassenger()) {
- entity.stopRiding();
+ if (entity.isPassenger()) {
+ entity.stopRiding();
+ }
+
+ entityplayer.playerConnection.teleport(teleEvent.getTo());
+ entityliving.fallDistance = 0.0F;
+ entity.fallDistance = 0.0F;
+ CraftEventFactory.entityDamage = this;
+ entityliving.damageEntity(DamageSource.FALL, 5.0F);
+ entity.damageEntity(DamageSource.FALL, 5.0F);
+ CraftEventFactory.entityDamage = null;
}
-
- entityliving.enderTeleportTo(this.locX(), this.locY(), this.locZ());
- entityliving.fallDistance = 0.0F;
- entityliving.damageEntity(DamageSource.FALL, 5.0F);
- entity.enderTeleportTo(this.locX(), this.locY(), this.locZ());
- entity.fallDistance = 0.0F;
- entity.damageEntity(DamageSource.FALL, 5.0F);
+ // CraftBukkit end
}
} else if (entityliving != null) {
entityliving.enderTeleportTo(this.locX(), this.locY(), this.locZ());
} else if (entity != null) {
entity.enderTeleportTo(this.locX(), this.locY(), this.locZ());