Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02: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:
86daffa2 Fix AssertionError when player hand set to empty type
This commit is contained in:
William Blake Galbreath
2019-12-09 19:28:05 -06:00
parent 8cb622fe75
commit fbc3f0d6bf
10 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 2fd28ca4cf131345d155c77e0282089205b553ab Mon Sep 17 00:00:00 2001
From 365204adec74f584e4009dbe535d916eb01cca2e 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
@@ -11,7 +11,7 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
4 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e8def7f81..40ab9daad 100644
index e8def7f812..40ab9daade 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1049,6 +1049,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -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 2c8bbf20a..2446e61c2 100644
index 2c8bbf20ae..2446e61c2b 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 {
@@ -124,10 +124,10 @@ index 2c8bbf20a..2446e61c2 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 f675ad2f5..0abca1a5b 100644
index addbafe66a..f61784fab2 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 {
@@ -2747,8 +2747,14 @@ public abstract class EntityLiving extends Entity {
this.aM = f;
}
@@ -145,7 +145,7 @@ index f675ad2f5..0abca1a5b 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6f378b5f6..26e95035b 100644
index 6f378b5f69..26e95035b2 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 6f378b5f6..26e95035b 100644
+ }
}
--
2.23.0.rc1
2.24.0.rc1