Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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

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