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

Update upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-16 19:49:35 -05:00
parent c548578b75
commit a2c8ca3f6c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 41c864ab7a...9bdce9f499

2
current-paper
View File

@@ -1 +1 @@
1.14.2--c6c2a1d7379cea421f6cfb513606a85d364d769a
1.14.2--8b712bedd00aaec0e6e9a554273f6c907e2702f4

6
patches/server/0027-Allow-color-codes-on-signs.patch
View File

@@ -1,4 +1,4 @@
From 24e81a3697d68a79e3741f6b7cfc0c31c1883bb9 Mon Sep 17 00:00:00 2001
From 4eec5d1965f0c06f9c6823c8f00bc604527dfeac Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Allow color codes on signs
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs
4 files changed, 21 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ed37f45f1..598bd6afc 100644
index d27354667..babbc4add 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1106,6 +1106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1112,6 +1112,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this);

8
patches/server/0030-Block-and-Fluid-Tick-Events.patch
View File

@@ -1,4 +1,4 @@
From 215b5058ec04eb3901fa9edb3470c5febbe4216c Mon Sep 17 00:00:00 2001
From 0362adeb5dfa1f4f32b3781f4d4165df371ead53 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:52 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -10,7 +10,7 @@ Subject: [PATCH] Block and Fluid Tick Events
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 92aad060e..01b77528e 100644
index 135ec94c6..a07785941 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -446,13 +446,13 @@ public class WorldServer extends World {
@@ -62,10 +62,10 @@ index a649a4c35..92eeaca42 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0c5379530..07f980158 100644
index e0d89cc53..43ca8bb2e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2157,6 +2157,24 @@ public class CraftWorld implements World {
@@ -2159,6 +2159,24 @@ public class CraftWorld implements World {
}
// Paper end