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 Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-29 02:08:19 -05:00
parent 6f286642b2
commit 5be272a836
11 changed files with 74 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b81cf7e90910b86b40a28bfdf32632d3ce1633e9 Mon Sep 17 00:00:00 2001
From 609cec66f047fa2d8e936286d4d98396d7e90efd Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:53:58 -0800
Subject: [PATCH] Tuinity Server Patches
@@ -13,9 +13,9 @@ Subject: [PATCH] Tuinity Server Patches
.../paper/server/ticklist/PaperTickList.java | 8 +
.../com/mojang/datafixers/util/Either.java | 6 +-
.../tuinity/chunk/ChunkRegionManager.java | 165 +++
.../chunk/QueuedChangesMapLong2Int.java | 155 +++
.../chunk/QueuedChangesMapLong2Int.java | 159 +++
.../chunk/QueuedChangesMapLong2Object.java | 170 +++
.../tuinity/tuinity/config/TuinityConfig.java | 305 +++++
.../tuinity/tuinity/config/TuinityConfig.java | 318 +++++
.../com/tuinity/tuinity/util/ChunkList.java | 119 ++
.../com/tuinity/tuinity/util/EntityList.java | 124 ++
.../tuinity/tuinity/util/IBlockDataList.java | 123 ++
@@ -94,7 +94,7 @@ Subject: [PATCH] Tuinity Server Patches
.../net/minecraft/server/WorldServer.java | 485 +++++++-
.../net/minecraft/server/WorldUpgrader.java | 2 +-
.../org/bukkit/craftbukkit/CraftServer.java | 15 +-
.../org/bukkit/craftbukkit/CraftWorld.java | 67 +-
.../org/bukkit/craftbukkit/CraftWorld.java | 74 +-
.../java/org/bukkit/craftbukkit/Main.java | 7 +
.../craftbukkit/entity/CraftEntity.java | 12 +
.../craftbukkit/entity/CraftPlayer.java | 37 +-
@@ -102,7 +102,7 @@ Subject: [PATCH] Tuinity Server Patches
src/main/java/org/spigotmc/AsyncCatcher.java | 2 +-
src/main/java/org/spigotmc/TrackingRange.java | 40 +
.../java/org/spigotmc/WatchdogThread.java | 58 +
98 files changed, 6600 insertions(+), 489 deletions(-)
98 files changed, 6624 insertions(+), 489 deletions(-)
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/QueuedChangesMapLong2Object.java
@@ -604,10 +604,10 @@ index 0000000000..ff17a100ba
\ No newline at end of file
diff --git a/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java
new file mode 100644
index 0000000000..d528d08ea5
index 0000000000..a5c38bc078
--- /dev/null
+++ b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java
@@ -0,0 +1,155 @@
@@ -0,0 +1,159 @@
+package com.tuinity.tuinity.chunk;
+
+import ca.spottedleaf.concurrentutil.lock.WeakSeqLock;
@@ -713,6 +713,8 @@ index 0000000000..d528d08ea5
+ }
+ }
+
+ this.queuedPuts.clear();
+
+ final LongIterator iterator1 = this.queuedRemove.iterator();
+ while (iterator1.hasNext()) {
+ final long key = iterator1.nextLong();
@@ -725,6 +727,7 @@ index 0000000000..d528d08ea5
+ }
+ }
+
+ this.queuedRemove.clear();
+
+ return true;
+ }
@@ -755,10 +758,11 @@ index 0000000000..d528d08ea5
+ this.visibleMap.remove(key);
+ }
+
+
+ return true;
+ } finally {
+ this.updatingMapSeqLock.releaseWrite();
+ this.queuedRemove.clear();
+ this.queuedPuts.clear();
+ }
+ }
+
@@ -942,10 +946,10 @@ index 0000000000..e5bb56cca9
\ 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
new file mode 100644
index 0000000000..78c011309a
index 0000000000..bcc5866aae
--- /dev/null
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
@@ -0,0 +1,305 @@
@@ -0,0 +1,318 @@
+package com.tuinity.tuinity.config;
+
+import ca.spottedleaf.concurrentutil.util.Throw;
@@ -1248,8 +1252,21 @@ index 0000000000..78c011309a
+ }
+ this.useOptimizedTracker = this.getBoolean("optimized-tracker", true);
+ }
+ }
+
+ public int spawnLimitMonsters;
+ public int spawnLimitAnimals;
+ public int spawnLimitWaterAnimals;
+ public int spawnLimitAmbient;
+
+ private void perWorldSpawnLimit() {
+ String path = "spawn-limits";
+
+ spawnLimitMonsters = getInt(path + ".monsters", -1);
+ spawnLimitAnimals = getInt(path + ".animals", -1);
+ spawnLimitWaterAnimals = getInt(path + ".water-animals", -1);
+ spawnLimitAmbient = getInt(path + ".ambient", -1);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/tuinity/tuinity/util/ChunkList.java b/src/main/java/com/tuinity/tuinity/util/ChunkList.java
@@ -9597,7 +9614,7 @@ index f70468adab..2be7962bc5 100644
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 051506fce8..4db397d9f9 100644
index 051506fce8..ae461b77b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -3,6 +3,7 @@ package org.bukkit.craftbukkit;
@@ -9629,7 +9646,21 @@ index 051506fce8..4db397d9f9 100644
if (chunkHolder.getChunk() != null) {
++ret;
}
@@ -432,8 +433,8 @@ public class CraftWorld implements World {
@@ -328,6 +329,13 @@ public class CraftWorld implements World {
this.generator = gen;
environment = env;
+
+ //Tuinity start - per world spawn limits
+ monsterSpawn = world.tuinityConfig.spawnLimitMonsters;
+ animalSpawn = world.tuinityConfig.spawnLimitAnimals;
+ waterAnimalSpawn = world.tuinityConfig.spawnLimitWaterAnimals;
+ ambientSpawn = world.tuinityConfig.spawnLimitAmbient;
+ //Tuinity end
}
@Override
@@ -432,8 +440,8 @@ public class CraftWorld implements World {
@Override
public Chunk[] getLoadedChunks() {
@@ -9640,7 +9671,7 @@ index 051506fce8..4db397d9f9 100644
}
@Override
@@ -462,6 +463,7 @@ public class CraftWorld implements World {
@@ -462,6 +470,7 @@ public class CraftWorld implements World {
net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
if (chunk != null) {
world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);
@@ -9648,7 +9679,7 @@ index 051506fce8..4db397d9f9 100644
}
return true;
@@ -1094,16 +1096,16 @@ public class CraftWorld implements World {
@@ -1094,16 +1103,16 @@ public class CraftWorld implements World {
@Override
public List<Entity> getEntities() {
@@ -9668,7 +9699,7 @@ index 051506fce8..4db397d9f9 100644
list.add(bukkitEntity);
}
}
@@ -1114,16 +1116,16 @@ public class CraftWorld implements World {
@@ -1114,16 +1123,16 @@ public class CraftWorld implements World {
@Override
public List<LivingEntity> getLivingEntities() {
@@ -9688,7 +9719,7 @@ index 051506fce8..4db397d9f9 100644
list.add((LivingEntity) bukkitEntity);
}
}
@@ -1144,7 +1146,7 @@ public class CraftWorld implements World {
@@ -1144,7 +1153,7 @@ public class CraftWorld implements World {
public <T extends Entity> Collection<T> getEntitiesByClass(Class<T> clazz) {
Collection<T> list = new ArrayList<T>();
@@ -9697,7 +9728,7 @@ index 051506fce8..4db397d9f9 100644
if (entity instanceof net.minecraft.server.Entity) {
if (((net.minecraft.server.Entity) entity).shouldBeRemoved) continue; // Paper
Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
@@ -1155,7 +1157,7 @@ public class CraftWorld implements World {
@@ -1155,7 +1164,7 @@ public class CraftWorld implements World {
Class<?> bukkitClass = bukkitEntity.getClass();
@@ -9706,7 +9737,7 @@ index 051506fce8..4db397d9f9 100644
list.add((T) bukkitEntity);
}
}
@@ -1168,7 +1170,7 @@ public class CraftWorld implements World {
@@ -1168,7 +1177,7 @@ public class CraftWorld implements World {
public Collection<Entity> getEntitiesByClasses(Class<?>... classes) {
Collection<Entity> list = new ArrayList<Entity>();
@@ -9715,7 +9746,7 @@ index 051506fce8..4db397d9f9 100644
if (entity instanceof net.minecraft.server.Entity) {
if (((net.minecraft.server.Entity) entity).shouldBeRemoved) continue; // Paper
Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
@@ -1181,7 +1183,7 @@ public class CraftWorld implements World {
@@ -1181,7 +1190,7 @@ public class CraftWorld implements World {
for (Class<?> clazz : classes) {
if (clazz.isAssignableFrom(bukkitClass)) {
@@ -9724,7 +9755,7 @@ index 051506fce8..4db397d9f9 100644
list.add(bukkitEntity);
}
break;
@@ -2467,10 +2469,43 @@ public class CraftWorld implements World {
@@ -2467,10 +2476,43 @@ public class CraftWorld implements World {
// Spigot start
@Override
public int getViewDistance() {

6
patches/server/0070-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From fa270781d1f741eeac50168841b348bfe87bd1d2 Mon Sep 17 00:00:00 2001
From e70383cceb757c4a39a83dad4f376842174c396e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:16 -0600
Subject: [PATCH] Add moon phase API
@@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 4db397d9f9..a49b3469a3 100644
index ae461b77b3..baff7edc1d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2447,6 +2447,14 @@ public class CraftWorld implements World {
@@ -2454,6 +2454,14 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}

6
patches/server/0071-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From a632d513add4198e32f1ba1ea272d0d605dae41d Mon Sep 17 00:00:00 2001
From 18a39d746f4e18746b938915ecc6319423b490df Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 8 Feb 2020 23:30:17 -0600
Subject: [PATCH] Add getPlacementBlockData to World
@@ -66,10 +66,10 @@ index 9c9b93f280..74a722cce5 100644
public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a49b3469a3..56033969f9 100644
index baff7edc1d..3013faeead 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2453,6 +2453,11 @@ public class CraftWorld implements World {
@@ -2460,6 +2460,11 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}

6
patches/server/0084-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
View File

@@ -1,4 +1,4 @@
From 5fdfd00ea6f8fb28074157d7701c7a97a4857ed1 Mon Sep 17 00:00:00 2001
From d8858bdf10933a2b7561252d9fbf633e0bd38b91 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 01:42:50 -0500
Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -25,10 +25,10 @@ index 4069d47808..c52f8b11d4 100644
public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 56033969f9..0dafa7666f 100644
index 3013faeead..732055e5cf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -380,12 +380,16 @@ public class CraftWorld implements World {
@@ -387,12 +387,16 @@ public class CraftWorld implements World {
@Override
public boolean setSpawnLocation(int x, int y, int z) {
try {

2
patches/server/0111-End-gateway-should-check-if-entity-can-use-portal.patch → patches/server/0110-End-gateway-should-check-if-entity-can-use-portal.patch
View File

@@ -1,4 +1,4 @@
From 87fa58e2eaa40c977475e10a639d1eaceb1eae66 Mon Sep 17 00:00:00 2001
From c4a816bd7d8e850234ed238fd88cc0276a9a0f43 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 18:33:05 -0500
Subject: [PATCH] End gateway should check if entity can use portal

53
patches/server/0110-Per-World-Spawn-limits.patch
View File

@@ -1,53 +0,0 @@
From deb0579dfd970e92f093971575092d54f1679fe6 Mon Sep 17 00:00:00 2001
From: chase <chasewhip20@gmail.com>
Date: Sun, 15 Mar 2020 18:32:22 -0600
Subject: [PATCH] Per World Spawn limits
---
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 11 +++++++++++
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 7 +++++++
2 files changed, 18 insertions(+)
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 974e2b4b83..c2590ef879 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -284,6 +284,17 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}
+ public int spawnLimitMonsters;
+ public int spawnLimitAnimals;
+ public int spawnLimitWaterAnimals;
+ public int spawnLimitAmbient;
+ private void perWorldSpawnLimit(){
+ spawnLimitMonsters = getInt("spawn-limits.monsters", -1);
+ spawnLimitAnimals = getInt("spawn-limits.animals", -1);
+ spawnLimitWaterAnimals = getInt("spawn-limits.water-animals", -1);
+ spawnLimitAmbient = getInt("spawn-limits.ambient", -1);
+ }
+
public boolean batRidable = false;
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0dafa7666f..5410a416af 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -329,6 +329,13 @@ public class CraftWorld implements World {
this.generator = gen;
environment = env;
+
+ // Purpur start
+ monsterSpawn = world.purpurConfig.spawnLimitMonsters;
+ animalSpawn = world.purpurConfig.spawnLimitAnimals;
+ waterAnimalSpawn = world.purpurConfig.spawnLimitWaterAnimals;
+ ambientSpawn = world.purpurConfig.spawnLimitAmbient;
+ // Purpur end
}
@Override
--
2.24.0

2
patches/server/0112-Add-BellRingEvent.patch → patches/server/0111-Add-BellRingEvent.patch
View File

@@ -1,4 +1,4 @@
From 9158944f57fc798ca077f0fc0ab2c525f3c979ca Mon Sep 17 00:00:00 2001
From c3bf5892742a1769f94d6ad9c9e686c85e20d129 Mon Sep 17 00:00:00 2001
From: Eearslya Sleiarion <eearslya@gmail.com>
Date: Mon, 24 Jun 2019 21:27:32 -0700
Subject: [PATCH] Add BellRingEvent

2
patches/server/0113-Disable-mojang-profiler.patch → patches/server/0112-Disable-mojang-profiler.patch
View File

@@ -1,4 +1,4 @@
From 94732fc6b87331a6852b05f6bb2082e44b886242 Mon Sep 17 00:00:00 2001
From 7f52c7d28f1f7a8dbec5b96b3095c063c453f74b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 12:48:02 -0500
Subject: [PATCH] Disable mojang profiler

2
patches/server/0114-Configurable-TPS-Catchup.patch → patches/server/0113-Configurable-TPS-Catchup.patch
View File

@@ -1,4 +1,4 @@
From 5eefb77fb1bc91088e70f17562264af959496e1c Mon Sep 17 00:00:00 2001
From edada40cc188b6dbef3de2fc9d1bf06de68322c1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:06:22 -0500
Subject: [PATCH] Configurable TPS Catchup

6
patches/server/0115-Breedable-Polar-Bears.patch → patches/server/0114-Breedable-Polar-Bears.patch
View File

@@ -1,4 +1,4 @@
From cac5ee12c02873d8f8e8d4e342865376236f15ee Mon Sep 17 00:00:00 2001
From 474d846fe6e4a31c5dc1c2c139dc991fb0ddc8d1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:46:44 -0500
Subject: [PATCH] Breedable Polar Bears
@@ -64,10 +64,10 @@ index 0a3906bde0..42fef3abaa 100644
this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, 1.0D));
this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c2590ef879..bb48a9232e 100644
index 974e2b4b83..4cd6b75f8e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -678,10 +678,15 @@ public class PurpurWorldConfig {
@@ -667,10 +667,15 @@ public class PurpurWorldConfig {
public boolean polarBearRidable = false;
public boolean polarBearRidableInWater = false;
public boolean polarBearRequireShiftToMount = true;

12
patches/server/0116-Configurable-jockey-options.patch → patches/server/0115-Configurable-jockey-options.patch
View File

@@ -1,4 +1,4 @@
From c56d4ca7c9688e5990c5cee362893e2910b3283f Mon Sep 17 00:00:00 2001
From 08862b53ac27eb1a64ba920f9fdc779564c6db42 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 21:39:32 -0500
Subject: [PATCH] Configurable jockey options
@@ -191,10 +191,10 @@ index ebbfcb75a4..8532385d8d 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bb48a9232e..459c49289e 100644
index 4cd6b75f8e..9423e5cdcb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -421,10 +421,16 @@ public class PurpurWorldConfig {
@@ -410,10 +410,16 @@ public class PurpurWorldConfig {
public boolean drownedRidable = false;
public boolean drownedRidableInWater = false;
public boolean drownedRequireShiftToMount = true;
@@ -211,7 +211,7 @@ index bb48a9232e..459c49289e 100644
}
public boolean elderGuardianRidable = false;
@@ -535,10 +541,16 @@ public class PurpurWorldConfig {
@@ -524,10 +530,16 @@ public class PurpurWorldConfig {
public boolean huskRidable = false;
public boolean huskRidableInWater = false;
public boolean huskRequireShiftToMount = true;
@@ -228,7 +228,7 @@ index bb48a9232e..459c49289e 100644
}
public boolean horseRidableInWater = false;
@@ -939,11 +951,17 @@ public class PurpurWorldConfig {
@@ -928,11 +940,17 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public boolean zombieRequireShiftToMount = true;
public boolean zombieTargetTurtleEggs = true;
@@ -246,7 +246,7 @@ index bb48a9232e..459c49289e 100644
}
public boolean zombieHorseCanSwim = false;
@@ -959,19 +977,31 @@ public class PurpurWorldConfig {
@@ -948,19 +966,31 @@ public class PurpurWorldConfig {
public boolean zombiePigmanRidableInWater = false;
public boolean zombiePigmanRequireShiftToMount = true;
public boolean zombiePigmanDontTargetUnlessHit = false;