Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
aa022fda Fix java cross-version compilation
8b7952a9 Implement alternative item-despawn-rate (#2128)
6ccf0bda Reimplement hopper optimization patch (#2388)
e264c365 MC-156852 fix (#2396)
b6c32b2a Fix recursion in EntityFox (#2418)
7c640a1a Updated Upstream (Bukkit/CraftBukkit/Spigot)  (#2415)
This commit is contained in:
William Blake Galbreath
2019-08-08 18:01:13 -05:00
parent 3935d71fba
commit 2f16d3d43e
17 changed files with 87 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0010-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 886717839c490903c3070917cff8e93e99aaf574 Mon Sep 17 00:00:00 2001
From 014a3286a45553421e3151fb625b2b0e4298433e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -1251,7 +1251,7 @@ index 8e463111b..2c34ab337 100644
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D));
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0054d3bed..2b7925b5d 100644
index a661d109d..545283ed7 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity {
@@ -1289,7 +1289,7 @@ index 0054d3bed..2b7925b5d 100644
}
protected void co() {
@@ -2035,7 +2044,7 @@ public abstract class EntityLiving extends Entity {
@@ -2039,7 +2048,7 @@ public abstract class EntityLiving extends Entity {
return 0.42F;
}
@@ -1298,7 +1298,7 @@ index 0054d3bed..2b7925b5d 100644
float f;
if (this.hasEffect(MobEffects.JUMP)) {
@@ -2046,6 +2055,7 @@ public abstract class EntityLiving extends Entity {
@@ -2050,6 +2059,7 @@ public abstract class EntityLiving extends Entity {
Vec3D vec3d = this.getMot();
@@ -1306,7 +1306,7 @@ index 0054d3bed..2b7925b5d 100644
this.setMot(vec3d.x, (double) f, vec3d.z);
if (this.isSprinting()) {
float f1 = this.yaw * 0.017453292F;
@@ -2264,10 +2274,12 @@ public abstract class EntityLiving extends Entity {
@@ -2268,10 +2278,12 @@ public abstract class EntityLiving extends Entity {
return this.onGround ? this.db() * (0.21600002F / (f * f * f)) : this.aO;
}
@@ -2159,7 +2159,7 @@ index 253ff9594..af3876a6c 100644
this.setMot(vec3d.x, 0.41999998688697815D, vec3d.z);
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 42d0c0017..984747f99 100644
index 4e9cc7137..42bb90b9c 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -13,10 +13,12 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {