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

Rebuild patches

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-23 00:01:24 -05:00
parent 50232df146
commit 6cbcd3a785
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/api/0005-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From c9c5d4932bf02be755c90c32d537803076bb30f5 Mon Sep 17 00:00:00 2001 From 58b35093b4a79b959e6737877fccc4d322bce0fb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:19 -0500 Date: Sun, 5 May 2019 12:58:19 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -8,10 +8,10 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
1 file changed, 16 insertions(+) 1 file changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index fe87caf1..d737937e 100644 index a78f390d..f47a6869 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -655,4 +655,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -681,4 +681,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/ */
boolean isHandRaised(); boolean isHandRaised();
// Paper end // Paper end

6
patches/api/0006-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From dc4ce39da212c22db5f734553ebd96371012b628 Mon Sep 17 00:00:00 2001 From 71371455d2847adc6228a22c726a3fe05cfe68f0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 06:08:35 -0500 Date: Fri, 3 May 2019 06:08:35 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -8,10 +8,10 @@ Subject: [PATCH] Integrate ridables
1 file changed, 14 insertions(+) 1 file changed, 14 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index d737937e..cf9dde56 100644 index f47a6869..3a896185 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -670,5 +670,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -696,5 +696,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance * @param safeFallDistance Safe fall distance
*/ */
void setSafeFallDistance(float safeFallDistance); void setSafeFallDistance(float safeFallDistance);

8
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From f0f99f77774709baa07af666ddb010f4fb93da02 Mon Sep 17 00:00:00 2001 From fe8f0a3e4e712232fa71d0296a24ce1a4c62f0e6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500 Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand Subject: [PATCH] Rebrand
@@ -83,10 +83,10 @@ index cd6e25923..bb227bc0f 100644
); );
} }
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 70f730996..f2b243326 100644 index f1cd38d42..d3316a6ac 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1405,7 +1405,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -1396,7 +1396,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
} }
public String getServerModName() { public String getServerModName() {
@@ -96,7 +96,7 @@ index 70f730996..f2b243326 100644
public CrashReport b(CrashReport crashreport) { public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 56e8a613e..04f214d95 100644 index 62cfb6e42..5500c3a22 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -200,7 +200,7 @@ import javax.annotation.Nullable; // Paper @@ -200,7 +200,7 @@ import javax.annotation.Nullable; // Paper

8
patches/server/0008-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From fd56e202b0bda0125e3491b9a71c62ac5ee1fcf9 Mon Sep 17 00:00:00 2001 From f3fb38c74738bbd3be7274aab1a2868e39e72add Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500 Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -39,7 +39,7 @@ index 8ce2fca80..686bca4f2 100644
if (i > 0) { if (i > 0) {
this.damageEntity(DamageSource.FALL, (float) i); this.damageEntity(DamageSource.FALL, (float) i);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 20e8ae96d..b27a9efcc 100644 index 75d845a75..0cb8c6cbc 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity { @@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -73,10 +73,10 @@ index 6404b32b2..f8a8da637 100644
if (i > 0) { if (i > 0) {
if (f >= 6.0F) { if (f >= 6.0F) {
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 b85385ba4..640faccfd 100644 index c4aa1945f..98f62d776 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
@@ -686,4 +686,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -699,4 +699,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return getHandle().isHandRaised(); return getHandle().isHandRaised();
} }
// Paper end // Paper end

6
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From f9ce19e5fc6f8f23906c90d87730d4fbb72b803c Mon Sep 17 00:00:00 2001 From 6291010d3faeae12377b6aa51a13d17a5b00e73c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -1246,10 +1246,10 @@ index 000000000..74ff48259
+ } + }
+} +}
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 640faccfd..2390baa75 100644 index 98f62d776..83eeab5c3 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
@@ -697,5 +697,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -710,5 +710,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setSafeFallDistance(float safeFallDistance) { public void setSafeFallDistance(float safeFallDistance) {
getHandle().safeFallDistance = safeFallDistance; getHandle().safeFallDistance = safeFallDistance;
} }