Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-28 21:56:37 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity/Akarin/Purpur)

Browse Source 
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
ff785fc Updated Upstream (Paper)

Akarin Changes:
2dab0a4 Removed gradle
72e3c4a Update README.md
bbad638 Update README.md
bbdea8e Update Jenkinsfile
bb9db8b Updated tuinity to spottedleaf repo
6961481 Updated Tuinity branch
de97830 Updated Tuinity
62d4b43 Update SUPPORT.md
21fffd0 Update README.md
4bd120b Merge pull request #186 from adsa562/patch-1
1f8eccf add demo server
630ea72 Updated Tuinity
59fae5a Made 1.15.2 build again
bd703ba Allowed building for dirs that have spaces
a339866 Update SUPPORT.md
db61690 stated that it is not a bedrock server software
df7efd2 Added Jenkinsfile
75b7f13 removed broken patch
19387b2 Updated Artifacts URL
c5a7778 fixed build
3abf7a7 Fixed Initialize step
2d3ea37 Updated Tuinity and Paper
220d1b8 Removed patch 0019 - breaks upstream
1ccf615 Added tuinity branch to gitmodules
c5e73c7 Updated Upstream (Tuinity)
3cd947f Updated Upstream (Tuinity)
14df550 cleanup scripts/importSources.sh
49d9af7 revert a broken patch
630492a revert a broken patch
cb5ea51 Fixed build failure
826c0f0 Updated 1.15.2 jenkinsfile to 1.16.1
574b206 Update SUPPORT.md
90e3f89 Update SUPPORT.md
c2a5f66 fix
b30241b fix
4e06aea fix
284809b 1.16.1

Purpur Changes:
096971d Rename kelp/vines options to make more sense
8ea89f9 Fix broken methods in purpur config
c505cf7 Updated Upstream (Paper)
695f3ac Add configurable snowball damage
2d04fb5 Updated Upstream (Paper)
badfd60 Rebuild patches
f3aff1b Merge branch 'ver/1.16.4' of github.com:pl3xgaming/Purpur into ver/1.16.4
cfcf7d7 Add critical hit check to EntityDamagedByEntityEvent
0b48c6c Add config for allowing Endermen to despawn even while holding a block
1349e72 Updated Upstream (Tuinity)
651105e Kelp weeping and twisting vines configurable max length
058399c Updated Upstream (Tuinity)
3e0a758 Add twisting and weeping vines growth rates
This commit is contained in:
Ivan Pekov 2020-11-26 11:52:33 +02:00
parent a47bfa7ea1
commit 8fee475387
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
27 changed files with 58 additions and 1123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -5,7 +5,7 @@
[submodule "Akarin"]
path = Akarin
url = https://github.com/Akarin-project/Akarin.git
branch = 1.16.2
branch = 1.16.3
[submodule "Purpur"]
path = Purpur
url = https://github.com/pl3xgaming/Purpur.git

2
Akarin

@ -1 +1 @@
Subproject commit bd703baa5f16e790bfb1e49866e7f959b6ae8891
Subproject commit 2dab0a410cf71a7eb660580ad88487f96dace3d7

1
PATCHES.md
View File

@ -104,7 +104,6 @@ # Patches
| server | Purpur config files | William Blake Galbreath | |
| server | Redirect Configs | tr7zw | |
| server | Remove some streams and object allocations | Phoenix616 | |
| server | Remove vanilla profiler callers | Sotr | |
| server | Respect PlayerKickEvent leaveMessage | Ivan Pekov | |
| server | Send more packets immediately | MrIvanPlays | |
| server | Shutdown Bootstrap thread pool | foss-mc | |

2
Purpur

@ -1 +1 @@
Subproject commit b8fb7ff5b5de02aa0c46d76d65f6f481f2fd6929
Subproject commit 096971dce8fda63b172d49c25b98ba7606fe978d

2
Tuinity

@ -1 +1 @@
Subproject commit 1421ccab6eb9a84975d0ca142e9054699010189b
Subproject commit ff785fc1d9b45a74c3eeadfc09f8e6de5289f568

2
patches/Akarin/server.txt
View File

@ -1 +1 @@
Disable-the-Snooper&Avoid-double-I-O-operation-on-load-player-file&Remove-vanilla-profiler-callers&Swaps-the-predicate-order-of-collision
Disable-the-Snooper&Avoid-double-I-O-operation-on-load-player-file&Swaps-the-predicate-order-of-collision

1120
patches/server/0001-Yatopia-Server-Fixes.patch
View File

File diff suppressed because it is too large Load Diff

2
patches/server/0003-Brandings.patch
View File

@ -39,7 +39,7 @@ index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c
.completer(new ConsoleCommandCompleter(this.server))
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 12922030c7ab0267018158d3fccb0eeedc370b7c..c6ad1dd8cabdad0b8ca54eecb82f45703b3eb1f2 100644
index 2d61504e69b6d2ee18c3b71bb032e5ab13417138..4f0ab969ec222c78b85791653c81fa4e92985172 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1524,7 +1524,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

8
patches/server/0006-Add-last-tick-time-API.patch
View File

@ -7,7 +7,7 @@ Original patch by:
Co-authored-by: tr7zw <tr7zw@live.de>
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c6ad1dd8cabdad0b8ca54eecb82f45703b3eb1f2..22792d8097351c5d1c2e085a20429b28f7f90b6e 100644
index 4f0ab969ec222c78b85791653c81fa4e92985172..18cf697da5665c45e7ea84c85513a615379474c4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -937,6 +937,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -21,12 +21,12 @@ index c6ad1dd8cabdad0b8ca54eecb82f45703b3eb1f2..22792d8097351c5d1c2e085a20429b28
long serverStartTime = SystemUtils.getMonotonicNanos(); // Paper
@@ -1007,7 +1009,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(gameprofilertick);
//this.methodProfiler.a(); // Akarin - remove caller
//this.methodProfiler.enter("tick"); // Akarin - remove caller
this.methodProfiler.a();
this.methodProfiler.enter("tick");
+ long tickStart = System.nanoTime(); // Yatopia
this.a(this::canSleepForTick);
+ lastTickTime = java.time.Duration.ofNanos(System.nanoTime() - tickStart); // Yatopia
//this.methodProfiler.exitEnter("nextTickWait"); // Akarin - remove caller
this.methodProfiler.exitEnter("nextTickWait");
this.X = true;
this.W = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java

4
patches/server/0007-Yatopia-configuration.patch
View File

@ -47,11 +47,11 @@ index c1eb8e8679de29cb0c18feed73b277801b4b07e5..c8e0310143e72e43832ecaebe6b9252f
this.setAllowFlight(dedicatedserverproperties.allowFlight);
this.setResourcePack(dedicatedserverproperties.resourcePack, this.ba());
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 9ae1b9b40324da3d7a35bf8bbd6b3bea242f2b73..5e657f5ed9536a6d3e23d840ee57319dd5df2542 100644
index a3dba232bfbc06471a0f5d5de78884cc335664d5..5ae64eedf47922973df6b98ad0f953b32f28e51c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -267,6 +267,7 @@ public abstract class EntityLiving extends Entity {
//this.world.getMethodProfiler().enter("livingEntityBaseTick"); // Akarin - remove caller
this.world.getMethodProfiler().enter("livingEntityBaseTick");
boolean flag = this instanceof EntityHuman;
+ if (!net.yatopia.server.YatopiaConfig.disableEntityStuckChecks) { // Yatopia

2
patches/server/0008-Per-entity-type-collision-settings.patch
View File

@ -59,7 +59,7 @@ index 537456a7427cddd6783f5b5d8ee2d655668c4c53..004184a7c3da4f72f68a5fd9b4dd5abd
}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 5e657f5ed9536a6d3e23d840ee57319dd5df2542..e5e8bfbcc9505e2a9615ac0149817eaf4c79d8a4 100644
index 5ae64eedf47922973df6b98ad0f953b32f28e51c..0f3f87469d4b1a0d190b7aad66aa9697830cdf10 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2859,7 +2859,7 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0014-lithium-enum_values.patch
View File

@ -39,7 +39,7 @@ index 5d3bb5f393a1e0e4a2e8b9a466530a91279697a9..7f084e7f11a829c10d113c7fb39eec0b
if (enumdirection2 != EnumDirection.DOWN && world.isBlockFacePowered(blockposition1.shift(enumdirection2), enumdirection2)) {
return true;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e5e8bfbcc9505e2a9615ac0149817eaf4c79d8a4..2a698a60bbd4ad40c4f18879877f003456398ac9 100644
index 0f3f87469d4b1a0d190b7aad66aa9697830cdf10..4abd93dfe2cc0e2c1a333a50f194a0a7bf6fa9a8 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2580,10 +2580,12 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0015-lithium-MixinGoalSelector.patch
View File

@ -9,7 +9,7 @@ Original code by JellySquid, licensed under GNU Lesser General Public License v3
you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 81df1cf34db8a1477bd394acd4e10b0da197c595..3cac9ebf4f9e2d9289a71e2065260b628b8ad19f 100644
index d3f0327a2a7cdedf3fe8d10df981a9f1cb378d26..fdf9d407f3f1d9aabcd835ed868391c6658eaae0 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -11,6 +11,7 @@ import java.util.function.Supplier;

4
patches/server/0018-Option-for-simpler-Villagers.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Option for simpler Villagers
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 9dc054e2e189f8c65a9d12f70e180e7ded79a997..d009c30e47e5419ae20af1a628d01a94942af758 100644
index 2faaf483cca26586226a2e08ac01285a62a68f6f..ce0d773d1c338ecf082573a219d8bfe024780a23 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -31,6 +31,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;
@ -109,7 +109,7 @@ index 9dc054e2e189f8c65a9d12f70e180e7ded79a997..d009c30e47e5419ae20af1a628d01a94
@Override
protected void mobTick() { mobTick(false); }
protected void mobTick(boolean inactive) {
//this.world.getMethodProfiler().enter("villagerBrain"); // Akarin - remove caller
this.world.getMethodProfiler().enter("villagerBrain");
+ // Yatopia start
+ if (simplerVillagerBehavior && this.getVillagerData().getProfession() == VillagerProfession.NONE) {
+ this.setVillagerData(this.getVillagerData().withProfession(getRandomProfession()));

2
patches/server/0021-Optimize-TileEntity-load-unload.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Optimize TileEntity load/unload
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 50eedfe5a0fe897f1e3b748bcae5c1d0c53b1467..1742399920cf6420082760049d5b8f2835704273 100644
index 55f12f104515e73e7f282bfbd21cb372ad5c3832..6c69cc17b11ba9de81dcf223074ecf7ce1214ccb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -42,9 +42,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
patches/server/0026-Fix-lead-fall-dmg-config.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix lead fall dmg config
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f657ace0000e7f4850088e04e7bfc8dd0be69a6c..015f8103506ed5235f4dfc4a889ff943c353d830 100644
index 6cdff124ac660134b1bf378f4f163ae8010d2ef9..094b4be4ef0e7c47696575158d3d0208542576ca 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1296,6 +1296,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0027-Optimize-some-stuff-in-WorldServer-ticking.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Optimize some stuff in WorldServer ticking
Replaced some streams and some array lists with glue lists
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ef25ea47159cc58659756fb4b2e223e556065b00..599e4c0f0127ebdbc8d1009719bda81224e43aab 100644
index ec86f278af15ec115d09135b75179e00dd013c11..58d05ee4432bb2ec58ed31d6cd07ccbd89f9eac3 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -64,11 +64,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0029-Add-timings-for-Pathfinder.patch
View File

@ -18,7 +18,7 @@ index d8c1a8dd867437443494ac169569139e25c9a635..0efdddc12247ed4aa6acce118c707090
* Gets a timer associated with a plugins tasks.
* @param bukkitTask
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index 12a648999c0d07af5f80eef382e3a9e3480fbf48..f4a4fdea3feaa88c8af61c20364eca2b21219494 100644
index 55fa3911703f96cf1f97c82b19d8e2d0d220016b..20780ad78eeb6ae3426e24c655624aa27360e382 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -29,6 +29,7 @@ public abstract class NavigationAbstract {

2
patches/server/0039-Fix-LightEngineThreaded-memory-leak.patch
View File

@ -18,7 +18,7 @@ index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..f3494ac1ad659352ca5595adf9e6919b
return this.size == 0 && this.pendingTasks.isEmpty();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 599e4c0f0127ebdbc8d1009719bda81224e43aab..921ac7d48b3524dc818c960d7bbb07e5a3b4fa93 100644
index 58d05ee4432bb2ec58ed31d6cd07ccbd89f9eac3..ff541132cf2064a5d6af866c8b486dfa886ad69f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1905,6 +1905,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0040-Respect-PlayerKickEvent-leaveMessage.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Respect PlayerKickEvent leaveMessage
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d796f2e5bce4c244bb392185d7810815df964781..b1b22d652f0bc4b6d2bff57438861677e2f12803 100644
index a69d8911f84956fb879e5a08ed542254ce7ebcde..016f0ea1505434f2f5eeb41792801cd714b219de 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -320,7 +320,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0043-Optimize-whitelist-command-for-multiple-additions-re.patch
View File

@ -185,7 +185,7 @@ index 0224a6d0e47e836fa485b39e7b4ce5b83ea554bf..fe578d306575bbdc8ca4a993a648e889
return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 22792d8097351c5d1c2e085a20429b28f7f90b6e..5847bbf4d8250522dd39323212f619c32159c385 100644
index 18cf697da5665c45e7ea84c85513a615379474c4..f24c33280ccb17a316c982f4cc4f004c3cc70c4b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1969,6 +1969,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

2
patches/server/0048-PaperPR-Fix-merging-spawning-values.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR: Fix merging spawning values
This patch is licensed under bukkit's original license, GPLv3
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 5cd3871dc480ddd3f7ab7ecfdac5cf98c1f37144..888cc227729e1585456ef9eedb8c5e9ab8402459 100644
index 6c15409982fd8005fede7c56c1ca74db5993d548..5e8c57aa026f5be735b0316da450b919692385f6 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -157,9 +157,12 @@ public final class SpawnerCreature {

2
patches/server/0052-Configurable-flight-checks.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flight checks
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index b1b22d652f0bc4b6d2bff57438861677e2f12803..6a91434cccdc6ad7d7624a4dc39e125a030a173f 100644
index 016f0ea1505434f2f5eeb41792801cd714b219de..dea37be8fc68c215fe4a44e182ee97797e838fe5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -177,7 +177,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0064-Configurable-criterion-triggers.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Configurable criterion triggers
This patch adds toggles for three criterion triggers that are called every tick. These can be very unnecessary, and especially in the case of CriterionTriggerEnterBlock, quite heavy.
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 5bb47279fdeeeef04f35115c916d24ddb8a098bb..375274c806c3347ff686c898a1ef1b672f99bbb5 100644
index 976c44c8eeecc513fa11de55b80317550f621407..911a98f6722628e79d37dec46321c3b3aedc5b4d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -431,6 +431,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

2
patches/server/0065-Configurable-BlockPhysicsEvent.patch
View File

@ -8,7 +8,7 @@ Paper does alleviate this quite well by only firing if plugins are listening, bu
This patch implements a hard toggle for the event.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5847bbf4d8250522dd39323212f619c32159c385..93a036abf2f170e62f82cd4afa40ef7e94a5021f 100644
index f24c33280ccb17a316c982f4cc4f004c3cc70c4b..94c20ad7fb8872f763953e0991a72a075700a024 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1412,7 +1412,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

2
patches/server/0068-Configurable-movement-checks.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable movement checks
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6a91434cccdc6ad7d7624a4dc39e125a030a173f..7ca9203b653a46641a223751bb6ff4c375edecde 100644
index dea37be8fc68c215fe4a44e182ee97797e838fe5..3a525ce57a8e82ae593676b5993b9942a53f692f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -440,7 +440,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
scripts/fetchUpstream.sh
View File

@ -14,7 +14,7 @@ function update {
}
function updateAll {
update Akarin 1.16.2
update Akarin 1.16.3
update Empirecraft master
update Origami 1.16
update Purpur ver/1.16.4