Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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:
7329e19c Updated Upstream (CraftBukkit)
b3a97d14 Fix startup errors when double clicking jar (#2903)
b51fbefc Revert "Fix errors on startup when double clicking jar (#2901)"
a0438fab Fix errors on startup when double clicking jar (#2901)
e0da6d4b Seed based feature search (Fixes #2312) (#2852)
78dfb77e Updated Upstream (Bukkit/CraftBukkit)
969ef51a Init legacy material data
c4714909 Fix items vanishing through end portal (Resolves #2681) (#2894)
74b0ef39 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-01-25 02:35:47 -06:00
parent 0118e083d1
commit 8f99ddb050
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From fb26e478e18ba7a028d1655ddc8a37a85621e512 Mon Sep 17 00:00:00 2001
From 2223402187e9fa667b32ad7d1b564a22842d7a7d 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
@@ -116,7 +116,7 @@ index 1d9ba04da..2bade947e 100644
this.d = false;
this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 863ff08fd..bdee6efe6 100644
index 941bebcac..f5b4c7e3c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -176,7 +176,7 @@ index 863ff08fd..bdee6efe6 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -3370,4 +3385,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3375,4 +3390,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -1317,7 +1317,7 @@ index 5782a25ec..dbe022340 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 2edb99b63..d5e8831f1 100644
index 584166f22..de22cad76 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving {