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

Update patches that slipped through last

Browse Source
This commit is contained in:
Zach Brown
2018-01-05 01:30:03 -06:00
parent 03ce426ddf
commit a088a9fa51
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/LivingEntity-setKiller.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 1eafdecb4..f81622a34 100644 index b9e106031..413bab0c9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -15,7 +15,7 @@ index 1eafdecb4..f81622a34 100644
+ // Paper start + // Paper start
+ @Override + @Override
+ public void setKiller(Player killer) { + public void setKiller(Player killer) {
+ EntityPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle(); + net.minecraft.server.EntityPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
+ getHandle().killer = entityPlayer; + getHandle().killer = entityPlayer;
+ getHandle().lastDamager = entityPlayer; + getHandle().lastDamager = entityPlayer;
+ getHandle().lastDamageByPlayerTime = entityPlayer == null ? 0 : 100; // 100 value taken from EntityLiving#damageEntity + getHandle().lastDamageByPlayerTime = entityPlayer == null ? 0 : 100; // 100 value taken from EntityLiving#damageEntity

10
Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
View File

@@ -5,13 +5,14 @@ Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
index ecfc316b..3f909c17 100644 index d555597dc..f5419dea4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
@@ -0,0 +0,0 @@ public class CraftFish extends AbstractProjectile implements Fish { @@ -0,0 +0,0 @@ public class CraftFish extends AbstractProjectile implements Fish {
Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1.");
this.biteChance = chance; this.biteChance = chance;
} }
+
+ // Paper start + // Paper start
+ @Override + @Override
+ public void remove() { + public void remove() {
@@ -21,8 +22,5 @@ index ecfc316b..3f909c17 100644
+ } + }
+ } + }
+ // Paper end + // Paper end
+ }
@Deprecated
public LivingEntity _INVALID_getShooter() {
return (LivingEntity) getShooter();
-- --