Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.14

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-06 22:37:10 -05:00
committed by BillyGalbreath
parent a4bfd94c63
commit b8fed8aaf2
16 changed files with 726 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/api/0001-Rebrand.patch
View File

@@ -1,18 +1,18 @@
From 54a9be260f9d24b37ddf635cd8b7cfee6ab99bf5 Mon Sep 17 00:00:00 2001
From 7b6ccc334157135036716bd93907cbb34f28cd82 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 00:57:16 -0500
Subject: [PATCH] Rebrand
---
pom.xml | 8 +++----
pom.xml | 9 ++++----
.../command/defaults/VersionCommand.java | 21 +++++++++++--------
2 files changed, 16 insertions(+), 13 deletions(-)
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13cdc25f..1e24fd1e 100644
index 81aefdf7..d73f48ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,17 +4,17 @@
@@ -4,18 +4,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -23,9 +23,10 @@ index 13cdc25f..1e24fd1e 100644
<version>dev-SNAPSHOT</version>
</parent>
- <groupId>com.destroystokyo.paper</groupId>
- <artifactId>paper-api</artifactId>
+ <artifactId>purpur-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version>
<version>1.14-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Paper-API</name>
@@ -35,10 +36,10 @@ index 13cdc25f..1e24fd1e 100644
<properties>
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index ee07fe5e..0c4e8604 100644
index a36ab04c..42c88ae1 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -214,8 +214,8 @@ public class VersionCommand extends BukkitCommand {
@@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
private void obtainVersion() {
String version = Bukkit.getVersion();
if (version == null) version = "Custom";
@@ -49,7 +50,7 @@ index ee07fe5e..0c4e8604 100644
int distance = getDistance(null, parts[0]);
switch (distance) {
case -1:
@@ -266,13 +266,16 @@ public class VersionCommand extends BukkitCommand {
@@ -263,13 +263,16 @@ public class VersionCommand extends BukkitCommand {
// Paper start
private static int getDistance(@NotNull String repo, @NotNull String verInfo) {

6
patches/api/0004-Expose-Animals-isBreedingItem-ItemStack.patch
View File

@@ -1,4 +1,4 @@
From 2c54818037c32884b46e0263e6fba858f997ac61 Mon Sep 17 00:00:00 2001
From 0598f218844ed5949808033cb1502ae3f2eab089 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:45:26 -0500
Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
@@ -8,10 +8,10 @@ Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/Animals.java b/src/main/java/org/bukkit/entity/Animals.java
index 3d4f8c3d..1f0cd380 100644
index 1047481e..939f131f 100644
--- a/src/main/java/org/bukkit/entity/Animals.java
+++ b/src/main/java/org/bukkit/entity/Animals.java
@@ -51,4 +51,14 @@ public interface Animals extends Ageable {
@@ -50,4 +50,14 @@ public interface Animals extends Ageable {
* @param ticks the love mode ticks. Must be positive
*/
void setLoveModeTicks(int ticks);

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

@@ -1,4 +1,4 @@
From 5b9dd7186e204dd62aa6430c2dc97f639a8d0cb8 Mon Sep 17 00:00:00 2001
From c9c5d4932bf02be755c90c32d537803076bb30f5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:19 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -8,10 +8,10 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
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
index 956d6886..a3baaecb 100644
index fe87caf1..d737937e 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -649,4 +649,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -655,4 +655,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
boolean isHandRaised();
// Paper end

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

@@ -1,4 +1,4 @@
From e8f6e9aeba7fe0b9bca877c2df79fea8c3ca9472 Mon Sep 17 00:00:00 2001
From dc4ce39da212c22db5f734553ebd96371012b628 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 06:08:35 -0500
Subject: [PATCH] Integrate ridables
@@ -8,10 +8,10 @@ Subject: [PATCH] Integrate ridables
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
index a3baaecb..097e82a0 100644
index d737937e..cf9dde56 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -664,5 +664,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -670,5 +670,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);