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

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,24 +1,24 @@
--- a/net/minecraft/server/EntityProjectile.java
+++ b/net/minecraft/server/EntityProjectile.java
@@ -33,6 +33,7 @@
@@ -32,6 +32,7 @@
this(entitytypes, entityliving.locX, entityliving.locY + (double) entityliving.getHeadHeight() - 0.10000000149011612D, entityliving.locZ, world);
this.shooter = entityliving;
this.shooterId = entityliving.getUniqueID();
+ this.projectileSource = (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity(); // CraftBukkit
}
protected void x_() {}
@@ -111,7 +112,7 @@
if (entity1.isInteractable()) {
if (entity1 == this.d) {
flag = true;
- } else if (this.shooter != null && this.ticksLived < 2 && this.d == null) {
+ } else if (this.shooter != null && this.ticksLived < 2 && this.d == null && this.shooter == entity1) { // CraftBukkit - MC-88491
this.d = entity1;
flag = true;
} else {
@@ -148,6 +149,11 @@
this.e(movingobjectposition.getBlockPosition());
public void a(Entity entity, float f, float f1, float f2, float f3, float f4) {
@@ -86,7 +87,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;
break;
@@ -106,6 +107,11 @@
this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
} else {
this.a(movingobjectposition);
+ // CraftBukkit start