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

Update to Minecraft 1.15

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,23 +1,23 @@
--- a/net/minecraft/server/EntityProjectile.java
+++ b/net/minecraft/server/EntityProjectile.java
@@ -32,6 +32,7 @@
this(entitytypes, entityliving.locX, entityliving.locY + (double) entityliving.getHeadHeight() - 0.10000000149011612D, entityliving.locZ, world);
this(entitytypes, entityliving.locX(), entityliving.getHeadY() - 0.10000000149011612D, entityliving.locZ(), world);
this.shooter = entityliving;
this.shooterId = entityliving.getUniqueID();
+ this.projectileSource = (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity(); // CraftBukkit
}
public void a(Entity entity, float f, float f1, float f2, float f3, float f4) {
@@ -86,7 +87,7 @@
@@ -83,7 +84,7 @@
break;
}
- if (this.shooter != null && this.ticksLived < 2 && this.as == null) {
+ if (this.shooter != null && this.ticksLived < 2 && this.as == null && this.shooter == entity) { // CraftBukkit - MC-88491
this.as = entity;
this.at = 3;
- if (this.shooter != null && this.ticksLived < 2 && this.ap == null) {
+ if (this.shooter != null && this.ticksLived < 2 && this.ap == null && this.shooter == entity) { // CraftBukkit - MC-88491
this.ap = entity;
this.aq = 3;
break;
@@ -106,6 +107,11 @@
@@ -103,6 +104,11 @@
this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
} else {
this.a(movingobjectposition);