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

Update Tuinity Patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-08 15:35:19 -05:00
parent aefaadb08f
commit c7850ac5cb
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
current-paper
View File

@@ -1 +1 @@
1.15.2--14a713f6ad2e85105f0be4e3ddebef4e19d0c22e 1.15.2--c1c24ab812da60ac48409d1ac20a3b8ff9cb41e3

22
patches/server/0002-Tuinity-Server-Patches.patch
View File

@@ -1,4 +1,4 @@
From fe6acadbec2da9de314a4f31eda7b6f0c5d4c64c Mon Sep 17 00:00:00 2001 From 9795b9171b86f82f9091f6c2325f312d980bd696 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com> From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:53:58 -0800 Date: Fri, 14 Dec 2018 21:53:58 -0800
Subject: [PATCH] Tuinity Server Patches Subject: [PATCH] Tuinity Server Patches
@@ -43,6 +43,7 @@ Subject: [PATCH] Tuinity Server Patches
.../net/minecraft/server/ChunkStatus.java | 5 +- .../net/minecraft/server/ChunkStatus.java | 5 +-
.../net/minecraft/server/DedicatedServer.java | 3 +- .../net/minecraft/server/DedicatedServer.java | 3 +-
.../minecraft/server/DoubleListOffset.java | 2 +- .../minecraft/server/DoubleListOffset.java | 2 +-
src/main/java/net/minecraft/server/EULA.java | 2 +-
.../java/net/minecraft/server/Entity.java | 53 ++ .../java/net/minecraft/server/Entity.java | 53 ++
.../minecraft/server/EntityEnderDragon.java | 4 +- .../minecraft/server/EntityEnderDragon.java | 4 +-
.../minecraft/server/EntityInsentient.java | 19 +- .../minecraft/server/EntityInsentient.java | 19 +-
@@ -101,7 +102,7 @@ Subject: [PATCH] Tuinity Server Patches
.../craftbukkit/entity/CraftPlayer.java | 37 +- .../craftbukkit/entity/CraftPlayer.java | 37 +-
.../java/org/spigotmc/ActivationRange.java | 41 +- .../java/org/spigotmc/ActivationRange.java | 41 +-
src/main/java/org/spigotmc/AsyncCatcher.java | 2 +- src/main/java/org/spigotmc/AsyncCatcher.java | 2 +-
97 files changed, 6857 insertions(+), 485 deletions(-) 98 files changed, 6858 insertions(+), 486 deletions(-)
create mode 100644 src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java create mode 100644 src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java
create mode 100644 src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java create mode 100644 src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java
create mode 100644 src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java create mode 100644 src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java
@@ -825,7 +826,7 @@ index 000000000..e5bb56cca
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
new file mode 100644 new file mode 100644
index 000000000..5edae85e7 index 000000000..feec44f57
--- /dev/null --- /dev/null
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
@@ -0,0 +1,225 @@ @@ -0,0 +1,225 @@
@@ -951,7 +952,7 @@ index 000000000..5edae85e7
+ public static int maxChunkLoadsPerPlayer; + public static int maxChunkLoadsPerPlayer;
+ +
+ private static void maxChunkLoadsPerPlayer() { + private static void maxChunkLoadsPerPlayer() {
+ maxChunkLoadsPerPlayer = TuinityConfig.getInt("max-pending-chunk-tickets-per-player", 49); + maxChunkLoadsPerPlayer = TuinityConfig.getInt("max-pending-chunk-tickets-per-player", 5);
+ if (maxChunkLoadsPerPlayer <= -1) { + if (maxChunkLoadsPerPlayer <= -1) {
+ maxChunkLoadsPerPlayer = Integer.MAX_VALUE; + maxChunkLoadsPerPlayer = Integer.MAX_VALUE;
+ } + }
@@ -5305,6 +5306,19 @@ index 73657f740..9ff09b02d 100644
private final DoubleList a; private final DoubleList a;
private final double b; private final double b;
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
index cf00f35a5..e54730f09 100644
--- a/src/main/java/net/minecraft/server/EULA.java
+++ b/src/main/java/net/minecraft/server/EULA.java
@@ -70,7 +70,7 @@ public class EULA {
Properties properties = new Properties();
properties.setProperty("eula", "false");
- properties.store(outputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).\nYou also agree that tacos are tasty, and the best food in the world."); // Paper - fix lag;
+ properties.store(outputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula)."); // Paper - fix lag; // Tuinity - Tacos are disgusting
} catch (Throwable throwable1) {
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8974c16bf..23e91183e 100644 index 8974c16bf..23e91183e 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java