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

Updated Upstream (Paper)

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

Paper Changes:
aba49696 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2019-08-30 11:31:47 -05:00
parent eb7c1fbad9
commit 73a03c746b
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 21faf8227b...aba4969668

2
current-paper
View File

@@ -1 +1 @@
1.14.4--f74e7e96d920686142e0d0b0b28cc5661c2502a6
1.14.4--a777f98965354fe01257e0e3ad9859062cb7a4bd

12
patches/server/0004-cows-to-mooshroom-when-fed-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 1e49c1d0ba9fd497dc02f9104398dfe3ead1a9cd Mon Sep 17 00:00:00 2001
From 2fd28ca4cf131345d155c77e0282089205b553ab Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -31,7 +31,7 @@ index e8def7f81..40ab9daad 100644
this.setPositionRotation(entity.locX, entity.locY, entity.locZ, entity.yaw, entity.pitch);
}
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index d2c2e3cc3..0c00a86a8 100644
index 2c8bbf20a..2446e61c2 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -42,7 +42,7 @@ index d2c2e3cc3..0c00a86a8 100644
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT), false));
this.goalSelector.a(4, new PathfinderGoalFollowParent(this, 1.25D));
this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D));
@@ -79,11 +80,80 @@ public class EntityCow extends EntityAnimal {
@@ -78,11 +79,80 @@ public class EntityCow extends EntityAnimal {
// CraftBukkit end
return true;
@@ -124,7 +124,7 @@ index d2c2e3cc3..0c00a86a8 100644
public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 31d14b19b..ba9b21549 100644
index f675ad2f5..0abca1a5b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2746,8 +2746,14 @@ public abstract class EntityLiving extends Entity {
@@ -145,7 +145,7 @@ index 31d14b19b..ba9b21549 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b0f0040a4..d013f8407 100644
index 6f378b5f6..26e95035b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -130,4 +130,9 @@ public class PurpurConfig {
@@ -159,5 +159,5 @@ index b0f0040a4..d013f8407 100644
+ }
}
--
2.20.1
2.23.0.rc1

14
patches/server/0041-Mending-mends-most-damages-equipment-first.patch
View File

@@ -1,4 +1,4 @@
From 0d22bf42411b99685e372b4e4d661bbe15496da1 Mon Sep 17 00:00:00 2001
From b6bb5c2e6b611b805eeaf9788eac48144d910e18 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
@@ -11,7 +11,7 @@ Subject: [PATCH] Mending mends most damages equipment first
4 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
index 1d16919e..69746fd1 100644
index 1d16919e6..69746fd1b 100644
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -241,9 +241,32 @@ public class EnchantmentManager {
@@ -49,10 +49,10 @@ index 1d16919e..69746fd1 100644
}
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 1a98442e..8a4eedb7 100644
index d8f23ff02..305504f0f 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity {
@@ -225,7 +225,7 @@ public class EntityExperienceOrb extends Entity {
if (this.d == 0 && entityhuman.bF == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((EntityPlayer) entityhuman).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper
entityhuman.bF = 2;
entityhuman.receive(this, 1);
@@ -62,7 +62,7 @@ index 1a98442e..8a4eedb7 100644
if (entry != null) {
ItemStack itemstack = (ItemStack) entry.getValue();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 0e164840..41e88916 100644
index 0e164840f..41e889165 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -364,10 +364,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index 0e164840..41e88916 100644
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 253e0b31..f8a35064 100644
index b0f5c3db3..938cd4291 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -151,6 +151,11 @@ public class PurpurConfig {
@@ -102,5 +102,5 @@ index 253e0b31..f8a35064 100644
private static void requireShiftToMount() {
requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
--
2.20.1
2.23.0.rc1

10
patches/server/0054-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 8abe41f131c0e11e484fa4d87bbbddd051e8510a Mon Sep 17 00:00:00 2001
From 1ca64cf36b3a95c2863c7ed5e6113f50335d6a79 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -29,7 +29,7 @@ index 770d21468..2ff5a12d8 100644
double d3 = this.locX - d0;
double d4 = this.locY - d1;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 2a943f316..8ee2e6c7f 100644
index 82da5bc1b..f45501410 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -49,10 +49,10 @@ index 2a943f316..8ee2e6c7f 100644
super(EntityTypes.PLAYER, world);
this.bY = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f9469e9e7..9f495027e 100644
index a90bc090c..cfa608e22 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1598,8 +1598,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1602,8 +1602,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cm = SystemUtils.getMonotonicMillis();
@@ -205,7 +205,7 @@ index 8aa8a672d..1ecadcebe 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f996c2c24..a03b2395c 100644
index 7ffcc1f1a..8214be52f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -318,7 +318,7 @@ public class WorldServer extends World {