Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
fcbeac8a [CI-SKIP] Readme update (#3702)
824f8086 Bandaid italic legacy serialization #3757 (#3760)

Tuinity Changes:
9f21359: Re-add optimise collision checking in player move packet handling
1152054: Revert player move packet optimisation
ef0a6c4: Optimise collision checking in player move packets
This commit is contained in:
William Blake Galbreath
2020-07-02 20:37:57 -05:00
parent 140a58f451
commit 5c7cdad371
127 changed files with 178 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0003-Purpur-config-files.patch
View File

@@ -1,21 +1,8 @@
From 5b76af39666ae3487ad49feb5cd0a09f8838c05e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
---
.../java/com/destroystokyo/paper/Metrics.java | 7 +-
.../net/minecraft/server/DedicatedServer.java | 9 ++
src/main/java/net/minecraft/server/World.java | 2 +
.../java/net/pl3x/purpur/PurpurConfig.java | 130 ++++++++++++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 59 ++++++++
.../pl3x/purpur/command/PurpurCommand.java | 65 +++++++++
.../org/bukkit/craftbukkit/CraftServer.java | 15 ++
.../java/org/bukkit/craftbukkit/Main.java | 8 ++
8 files changed, 292 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
create mode 100644 src/main/java/net/pl3x/purpur/command/PurpurCommand.java
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 24641501a..78369e670 100644
@@ -420,6 +407,3 @@ index a216b1336..c1e7e6a45 100644
// Paper start
acceptsAll(asList("server-name"), "Name of the server")
.withRequiredArg()
--
2.26.2