mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: c6987e1a Peek the unload queue for chunk generation checks (#2332) 4ac69cec Bring task execution into server tick timings (#2357) edce5384 Amend PlayerInteractAtEntityEvent javadoc for ArmorStands (#2309) 8ecd4337 Set spawning entity for fireworks spawned by a crossbow (#2358)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From c9814cac1d9c5d1fff68005d5265a232972460bc Mon Sep 17 00:00:00 2001
|
||||
From 99abe96927a7347e1f3ab5604567ba0f66fd9b01 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 4 May 2019 01:02:11 -0500
|
||||
Subject: [PATCH] Rebrand
|
||||
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
|
||||
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 0130272236..d1d3973928 100644
|
||||
index beda5dc8a2..a12fa0163c 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -1,11 +1,11 @@
|
||||
@@ -86,10 +86,10 @@ index cd6e259239..bb227bc0fb 100644
|
||||
);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index e9a4973592..57a1ab8b9e 100644
|
||||
index 01b389d89f..81ed2dfd25 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1433,7 +1433,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -1438,7 +1438,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
}
|
||||
|
||||
public String getServerModName() {
|
||||
|
||||
Reference in New Issue
Block a user