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 upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-26 15:28:55 -05:00
parent f8c579573a
commit 66becc7979
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: c2aec55dce...d627cfa110

2
current-paper
View File

@@ -1 +1 @@
1.14.1--1283b42ac3c35061a7282a15a3ac52ab0db0b8ea
1.14.1--52f1b241015c519adc7d9ec86b61bcfb36e60516

6
patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 9266c5c4a2632b05a03ea9e3e2a5052c1f5dc170 Mon Sep 17 00:00:00 2001
From c44024e655fce6d2e2b9f63f66ae868d0072470e 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
@@ -10,10 +10,10 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
3 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3b1555dd2..74f00b376 100644
index 3c6dc5ef0..fc203f5fb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -995,6 +995,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -999,6 +999,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}

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

@@ -1,4 +1,4 @@
From 6291010d3faeae12377b6aa51a13d17a5b00e73c Mon Sep 17 00:00:00 2001
From 937214c5aa60be8a9dbf6ea56dc0ff2cfa196da6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -64,7 +64,7 @@ index 454627f65..df3d6cf28 100644
this.d = false;
this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 74f00b376..777e6ee3c 100644
index fc203f5fb..036ea4576 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -92,7 +92,7 @@ index 74f00b376..777e6ee3c 100644
public boolean noclip;
public float M;
protected final Random random;
@@ -2067,6 +2069,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2072,6 +2074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Spigot end
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.getRidingPassenger() instanceof EntityHuman)) {
this.passengers.add(0, entity);
@@ -100,7 +100,7 @@ index 74f00b376..777e6ee3c 100644
} else {
this.passengers.add(entity);
}
@@ -2105,6 +2108,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2110,6 +2113,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -578,7 +578,7 @@ index 5cc08ca7c..ca4e9d0dd 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0cb8c6cbc..27375059f 100644
index 7eef55e2c..6e0d8dccc 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity {