Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-06-25 22:25:06 +02:00
Code Issues Projects Releases Wiki Activity

Update to 1.16.3

Browse Source
This commit is contained in:
Ivan Pekov 2020-09-11 09:03:00 +03:00
parent a909429e0c
commit ac7e8f6ee3
29 changed files with 161 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/build.yml vendored
View File

@ -5,12 +5,14 @@ on:
paths-ignore:
- '*.md'
branches:
- ver/1.16.3
- ver/1.16.2
- ver/1.16.1
pull_request:
paths-ignore:
- '*.md'
branches:
- ver/1.16.3
- ver/1.16.1
- ver/1.16.2
@ -50,29 +52,12 @@ jobs:
git config --global user.name "Github CI"
sudo chmod -R -f 777 scripts
./yatopia init
- name: Build Maven Depends
if: steps.maven-cache.outputs.cache-hit != 'true'
run: |
cd Tuinity
./tuinity jar
cd ..//
# - name: Build Maven Depends
# if: steps.maven-cache.outputs.cache-hit != 'true'
# run: |
# cd Tuinity
# ./tuinity jar
# cd ..//
- name: Build Yatopia
run: |
./yatopia full
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: Yatopia-${{ matrix.java }}
path: yatopia-1.16.2-paperclip.jar
- name: Deploy Release
if: github.ref == 'refs/heads/ver/1.16.2'
uses: WebFreak001/deploy-nightly@v1.0.3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # automatically provided by github actions
with:
upload_url: https://uploads.github.com/repos/YatopiaMC/Yatopia/releases/30125485/assets{?name,label} # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
release_id: 30125485 # same as above (id can just be taken out the upload_url, it's used to find old releases)
asset_path: yatopia-1.16.2-paperclip.jar # path to archive to upload
asset_name: Yatopia-1.16.2-JDK${{ matrix.java }}-paperclip.jar # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash
asset_content_type: application/zip # required by GitHub API
max_releases: 3 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

4
.gitmodules vendored
View File

@ -1,7 +1,7 @@
[submodule "Tuinity"]
path = Tuinity
url = https://github.com/YatopiaMC/Yatopia-Tuninty.git
branch = ver/1.16.2
branch = ver/1.16.3
[submodule "Akarin"]
path = Akarin
url = https://github.com/Akarin-project/Akarin.git
@ -9,7 +9,7 @@
[submodule "Purpur"]
path = Purpur
url = https://github.com/pl3xgaming/Purpur.git
branch = ver/1.16.2
branch = ver/1.16.3
[submodule "Empirecraft"]
path = Empirecraft
url = https://github.com/starlis/empirecraft.git

2
Purpur

@ -1 +1 @@
Subproject commit 36672d6bf24aff86c6e283ac70d70f2654c11987
Subproject commit fc3376c26dcc05cacf6aa6897b43f843f7c1c5ca

5
SECURITY.md
View File

@ -5,9 +5,10 @@ ## Supported Versions:
| Version | Supported |
| ------- | ------------------ |
| 1.16.3 | :white_check_mark: |
| 1.16.2 | :white_check_mark: |
| 1.16.1 | :white_check_mark: |
| 1.15.2 | :white_check_mark: |
| 1.16.1 | :x: |
| 1.15.2 | :x: |
| 1.15.2WPT | :x: |
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
## Reporting a vulnerability:

2
Tuinity

@ -1 +1 @@
Subproject commit 483289c76b88b5fcd05923e3a5dceacc0e5af0cc
Subproject commit adaafb4a8dfd2f977dc0e46f636d8c0e59559e35

4
patches/api/0002-Modify-POM.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify POM
diff --git a/pom.xml b/pom.xml
index 95a99b7b55a980b9ad81a0d536507cf890464260..9f87bd4e200d35746e19e4f0a96a626da15e90f4 100644
index 3b5dcb434f3357183859281941139a1c86d9cb1b..84284073f5d236c9a2e2b381f448fa30933cf87d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
@ -22,7 +22,7 @@ index 95a99b7b55a980b9ad81a0d536507cf890464260..9f87bd4e200d35746e19e4f0a96a626d
- <artifactId>tuinity-api</artifactId>
+ <artifactId>yatopia-api</artifactId>
<version>1.16.2-R0.1-SNAPSHOT</version>
<version>1.16.3-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Tuinity-API</name>

2
patches/api/0004-Add-GameProfileLookupEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add GameProfileLookupEvent
diff --git a/pom.xml b/pom.xml
index 9f87bd4e200d35746e19e4f0a96a626da15e90f4..a4899ea8a5e31114101d5055a4b613e1363e8329 100644
index 84284073f5d236c9a2e2b381f448fa30933cf87d..c1155ea1f455ddd01da7f84195e3e1db788f76c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,10 @@

2
patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT API as a first-class lib
diff --git a/pom.xml b/pom.xml
index a4899ea8a5e31114101d5055a4b613e1363e8329..fabf40fcb8a3ace92fd69d92004a9d8d6946e88b 100644
index c1155ea1f455ddd01da7f84195e3e1db788f76c0..4aa457af0e9e809359a7934ccfce14e33f3f1da7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,11 @@

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

@ -454,7 +454,7 @@ index 4cc30faacb1ee173cbc546cc57ff4ce032024587..00000000000000000000000000000000
-
- iblockdata.dropNaturally(world, blockposition, itemstack);
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 032f8029d73324dbcb28c1b872280f4e2930efc7..1d02880e5818d22c13d67d3f44844a2cca51c164 100644
index 100afe2000c981c6837b98436bd53add96e17a29..5541531223456d9890dee154fec058314d56f256 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -721,9 +721,14 @@ public abstract class BlockBase {
@ -733,10 +733,10 @@ index 8347faf8a7ee62d27cf5eb9f285695fddadfa624..00000000000000000000000000000000
-
- AttributeDefaults.a();
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a3adbd32a 100644
index 8755e32b44165b997739ac213820cf6715b0a757..d413574045360c4724d2c84f1bbbf4d9abe53fe4 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -442,7 +442,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -439,7 +439,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setPosition(double d0, double d1, double d2) {
this.setPositionRaw(d0, d1, d2);
//this.a(this.size.a(d0, d1, d2)); // Paper - move into setPositionRaw
@ -745,7 +745,7 @@ index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a
}
protected void ae() {
@@ -525,7 +525,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -522,7 +522,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
this.justCreated = false;
@ -754,7 +754,7 @@ index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a
}
public void resetPortalCooldown() {
@@ -2377,7 +2377,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2375,7 +2375,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey);
if (true && !this.isPassenger() && this.portalTicks++ >= i) { // CraftBukkit
@ -763,7 +763,7 @@ index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a
this.portalTicks = i;
this.resetPortalCooldown();
// CraftBukkit start
@@ -2387,7 +2387,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2385,7 +2385,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.b(worldserver1);
}
// CraftBukkit end
@ -772,7 +772,7 @@ index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a
}
this.inPortal = false;
@@ -2770,14 +2770,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2768,14 +2768,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
// Paper end
if (this.world instanceof WorldServer && !this.dead) {
@ -786,10 +786,10 @@ index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a
// CraftBukkit end
- this.world.getMethodProfiler().enter("reposition");
+ //this.world.getMethodProfiler().enter("reposition"); // Akarin - remove caller
ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.a, this.yaw, this.pitch, worldserver, null); // CraftBukkit
ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.ORIGIN, this.yaw, this.pitch, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -2810,10 +2810,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2808,10 +2808,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
this.bM();
@ -802,7 +802,7 @@ index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a
return entity;
}
} else {
@@ -3048,7 +3048,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3046,7 +3046,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
entity.a(entity1, Entity::teleportAndSync);
}
@ -812,21 +812,36 @@ index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a
}
diff --git a/src/main/java/net/minecraft/server/Entity.java.rej b/src/main/java/net/minecraft/server/Entity.java.rej
deleted file mode 100644
index 4383822bece27e6f165c3c6bdd20458f09da58f5..0000000000000000000000000000000000000000
index 4383822bece27e6f165c3c6bdd20458f09da58f5..4ae5cdecd0df82e4a9269e23115748f5aafbcf74 100644
--- a/src/main/java/net/minecraft/server/Entity.java.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java (rejected hunks)
+++ b/src/main/java/net/minecraft/server/Entity.java.rej
@@ -1,10 +1,18 @@
diff a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java (rejected hunks)
-@@ -3015,7 +3015,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
- WorldServer worldserver = (WorldServer) this.world;
-
+@@ -2770,14 +2770,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+ }
+ // Paper end
+ if (this.world instanceof WorldServer && !this.dead) {
+- this.world.getMethodProfiler().enter("changeDimension");
++ //this.world.getMethodProfiler().enter("changeDimension"); // Akarin - remove caller
+ // CraftBukkit start
+ // this.decouple();
+ if (worldserver == null) {
+ return null;
+ }
+ // CraftBukkit end
+- this.world.getMethodProfiler().enter("reposition");
++ //this.world.getMethodProfiler().enter("reposition"); // Akarin - remove caller
+ ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.a, this.yaw, this.pitch, worldserver, null); // CraftBukkit
- this.setPositionRotation(d0, d1, d2, this.yaw, this.pitch);
-- this.collectPassengers().forEach((entity) -> { // Akarin - remove stream
-+ for (Entity entity : this.collectPassengers()) {// Akarin - remove stream
- worldserver.chunkCheck(entity);
- entity.aE = true;
- Iterator iterator = entity.passengers.iterator();
+ if (shapedetectorshape == null) {
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
index 1942fae27051af79b6eb1d790a219da100bf889e..edad9669c67cab0df88947fa86b467c26deaa5f0 100644
--- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
@ -1106,7 +1121,7 @@ index be7a4b07540f6cc29c9ed76668bc1eaf9850013c..00000000000000000000000000000000
- if (this.eO()) {
- ++this.bz;
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
index 66bfebe1c2a803bfed439f4d09f7ffa37fce78a8..1904d493c356f521bbae41ea1fe3a38ad252e744 100644
index f5c9e4e0aeaddd96a3e11a25306bbea0ba27f86a..8f26e7bef2c1e00aea4f95cad3d365464f563d37 100644
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
@@ -19,17 +19,6 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@ -1140,7 +1155,7 @@ index 66bfebe1c2a803bfed439f4d09f7ffa37fce78a8..1904d493c356f521bbae41ea1fe3a38a
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 96c18ddf92fe5784e901dd2f25a059177a89ee35..b66125bcccb9cadc7aaa41627fc560785907e465 100644
index 855c3b815474f65a1b284767aa7041446a787997..e2e2ee22e58368f51f5c5acc6c3cc151a57716ee 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -242,13 +242,13 @@ public abstract class EntityInsentient extends EntityLiving {
@ -1277,7 +1292,7 @@ index bccb7cd89241ca30549f5442a4ef9847cfdb67a9..00000000000000000000000000000000
- }
-
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index dc9621174b88c871c3579f04fee6bc1cfd1a3eff..fd3406f3b4457968d1a7cf8c9e9c79ef0c058538 100644
index 5d6ddcbe6bb6663353cd8cd5e7b1ee3927091fc3..7083b379568fd101bec19469b60daf062bc4d137 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -366,7 +366,7 @@ public abstract class EntityLiving extends Entity {
@ -1289,7 +1304,7 @@ index dc9621174b88c871c3579f04fee6bc1cfd1a3eff..fd3406f3b4457968d1a7cf8c9e9c79ef
}
public boolean cM() {
@@ -2514,10 +2514,10 @@ public abstract class EntityLiving extends Entity {
@@ -2515,10 +2515,10 @@ public abstract class EntityLiving extends Entity {
}
this.aK += (f3 - this.aK) * 0.3F;
@ -1303,7 +1318,7 @@ index dc9621174b88c871c3579f04fee6bc1cfd1a3eff..fd3406f3b4457968d1a7cf8c9e9c79ef
while (this.yaw - this.lastYaw < -180.0F) {
this.lastYaw -= 360.0F;
@@ -2551,7 +2551,7 @@ public abstract class EntityLiving extends Entity {
@@ -2552,7 +2552,7 @@ public abstract class EntityLiving extends Entity {
this.aD += 360.0F;
}
@ -1312,7 +1327,7 @@ index dc9621174b88c871c3579f04fee6bc1cfd1a3eff..fd3406f3b4457968d1a7cf8c9e9c79ef
this.aL += f2;
if (this.isGliding()) {
++this.be;
@@ -2752,19 +2752,19 @@ public abstract class EntityLiving extends Entity {
@@ -2753,19 +2753,19 @@ public abstract class EntityLiving extends Entity {
}
this.setMot(d4, d5, d6);
@ -1337,7 +1352,7 @@ index dc9621174b88c871c3579f04fee6bc1cfd1a3eff..fd3406f3b4457968d1a7cf8c9e9c79ef
if (this.jumping && this.cS()) {
double d7;
@@ -2791,8 +2791,8 @@ public abstract class EntityLiving extends Entity {
@@ -2792,8 +2792,8 @@ public abstract class EntityLiving extends Entity {
this.jumpTicks = 0;
}
@ -1348,7 +1363,7 @@ index dc9621174b88c871c3579f04fee6bc1cfd1a3eff..fd3406f3b4457968d1a7cf8c9e9c79ef
this.aR *= 0.98F;
this.aT *= 0.98F;
this.r();
@@ -2801,15 +2801,15 @@ public abstract class EntityLiving extends Entity {
@@ -2802,15 +2802,15 @@ public abstract class EntityLiving extends Entity {
// SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
this.g(new Vec3D((double) this.aR, (double) this.aS, (double) this.aT));
// SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@ -1461,7 +1476,7 @@ index 947d12a17358d209be65c828e9dd297c54af91ac..00000000000000000000000000000000
- this.damageEntity(DamageSource.DROWN, 1.0F);
- }
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index b3616185d285849c51ce1c0d2ac61e61e0fa8d97..d62f15d7bfa9bd1f7ff4f41cbd26150623729692 100644
index 92704a07899568193e376103c9427376f008fd24..caee479d3ee53f388121e6f675085ff7fd7ff2eb 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -240,7 +240,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@ -1596,7 +1611,7 @@ index d1016d22fbb2dd15042fd6ccdf2ee7848351e518..00000000000000000000000000000000
-
- entitypigzombie.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e41054e606a60319b5c2d98dcb166b5755d23867..06ec0b2e734f0192a74da49a692a9675b2d51bb8 100644
index d1953b40c6684f8ebf7fbcd6c240b66b92167794..364485a28f6273fa55c777024fac58ef1e0fd201 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -765,11 +765,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -1931,7 +1946,7 @@ index 74d10212e547adf96762155adb03c0158df00a16..00000000000000000000000000000000
- ran = true;
- }
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7a7ba8047d3c9cde4b7a0bf6e921a5f4795ef9cc..8005f7eb073270a46f38601705ca4e89899015b1 100644
index 58616542c1b69290e19d4cd9f4e0e92911d8a1f7..3b7d648fea24bc07d56505123a59c4f8de6bb3dd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -999,7 +999,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -2426,7 +2441,7 @@ index bada470cba41cce9beb9eb04227b42c1d489d731..00000000000000000000000000000000
- private int c;
- private TileEntityShulkerBox.AnimationPhase i;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c95bc3bcf8d9545cb87f1b2130cfd393c2ed77b4..3c852d008737415337ef778d988d81ad633b201d 100644
index 6ff36345b0fbb7e67d3b7ad29823a135ea5bb3a3..2a8db362f007c25472b2114fd7a757a40a418e82 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -97,6 +97,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -2548,7 +2563,7 @@ index 3a35169eaf680c45fe42922eb5f0014fa422c31c..00000000000000000000000000000000
- }
- // Spigot Start
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 302932f69213b9c0b60c8ace3efa27f1d1f900ed..6aaa3e6b7e0919b85fbfbb0b70a647a18aeebfd7 100644
index 1b35065484833af89b43b28c9db3557ccdf1e1b3..6052ef1d4ede54cf23aa854298cbcd4f7e8ce9cf 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -869,11 +869,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -2639,7 +2654,23 @@ index 302932f69213b9c0b60c8ace3efa27f1d1f900ed..6aaa3e6b7e0919b85fbfbb0b70a647a1
final BlockPosition.MutableBlockPosition blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
if (!this.paperConfig.disableThunder && flag && this.V() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder
@@ -1401,7 +1401,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1296,13 +1296,13 @@ public class WorldServer extends World implements GeneratorAccessSeed {
gameprofilerfiller.a(() -> {
return IRegistry.ENTITY_TYPE.getKey(entity.getEntityType()).toString();
});
- gameprofilerfiller.c("tickNonPassenger");
+ //gameprofilerfiller.c("tickNonPassenger"); // Akarin - remove caller
if (isActive) { // Paper - EAR 2
TimingHistory.activatedEntityTicks++; // Paper
entity.tick();
entity.postTick(); // CraftBukkit
} else { entity.inactiveTick(); } // Paper - EAR 2
- gameprofilerfiller.exit();
+ //gameprofilerfiller.exit(); // Akarin - remove caller
}
this.chunkCheck(entity);
@@ -1422,7 +1422,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// Tuinity end
}
@ -2650,10 +2681,10 @@ index 302932f69213b9c0b60c8ace3efa27f1d1f900ed..6aaa3e6b7e0919b85fbfbb0b70a647a1
diff --git a/src/main/java/net/minecraft/server/WorldServer.java.rej b/src/main/java/net/minecraft/server/WorldServer.java.rej
deleted file mode 100644
index 6b024f18ebc32034d1d81ef98f7117944bc0cd0a..0000000000000000000000000000000000000000
index 82cfbef39662d079a9ffef57c9a768c499b1c8f1..0000000000000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/WorldServer.java.rej
+++ /dev/null
@@ -1,94 +0,0 @@
@@ -1,119 +0,0 @@
-diff a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java (rejected hunks)
-@@ -887,11 +887,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
-
@ -2739,6 +2770,31 @@ index 6b024f18ebc32034d1d81ef98f7117944bc0cd0a..00000000000000000000000000000000
- final BlockPosition.MutableBlockPosition blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
-
- if (!this.paperConfig.disableThunder && flag && this.T() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder
-@@ -1284,10 +1284,10 @@ public class WorldServer extends World implements GeneratorAccessSeed {
- gameprofilerfiller.a(() -> {
- return IRegistry.ENTITY_TYPE.getKey(entity.getEntityType()).toString();
- });
-- gameprofilerfiller.c("tickNonPassenger");
-+ //gameprofilerfiller.c("tickNonPassenger"); // Akarin - remove caller
- entity.tick();
- entity.postTick(); // CraftBukkit
-- gameprofilerfiller.exit();
-+ //gameprofilerfiller.exit(); // Akarin - remove caller
- }
-
- this.chunkCheck(entity);
-@@ -1325,9 +1325,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
- gameprofilerfiller.a(() -> {
- return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
- });
-- gameprofilerfiller.c("tickPassenger");
-+ //gameprofilerfiller.c("tickPassenger"); // Akarin - remove caller
- entity1.passengerTick();
-- gameprofilerfiller.exit();
-+ //gameprofilerfiller.exit(); // Akarin - remove caller
- }
-
- this.chunkCheck(entity1);
-@@ -1377,7 +1377,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
- }
- }
@ -3023,7 +3079,7 @@ index 12ee96c0bb54227dbfab7240d8b114577e0b78f3..00000000000000000000000000000000
-
- public int villagerBrainTicks = 1;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ad868f6f49e36bcb7d62d31bccb89404098a0cfc..510e82002ed6ada5c2f4b14e01021068806a98e8 100644
index bae899f354afe1819c7850f30d827a33696b00fa..74aa903d3c362351f688979daa0c4f4145e582e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -842,6 +842,8 @@ public final class CraftServer implements Server {
@ -3077,7 +3133,7 @@ index ad868f6f49e36bcb7d62d31bccb89404098a0cfc..510e82002ed6ada5c2f4b14e01021068
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index b2e2fcad2637e73cd69e14ac186c37c628da2761..132ad379242d9aa2defc639f79764050b73c572d 100644
index 210cb10ea75b99d3b5d7b5bce5cea44e3cc0fc20..1acfbf3a63ee0e8d4bd4773f06b4be1e4961f527 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -154,6 +154,21 @@ public class Main {
@ -3125,7 +3181,7 @@ index 916603085d652444027e4513b77293ece84a6c4f..00000000000000000000000000000000
- acceptsAll(asList("server-name"), "Name of the server")
- .withRequiredArg()
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index de574ae92a8c055195c8919be4aec848489baa86..981327f6ff5f18bf5c0b56859370d867506f4417 100644
index 30cd34fb26ff0c4fe9b9ff5cede6c118160909f8..026ebaecfd8edf36cb85d868dd855ec4aa8a8415 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -682,8 +682,12 @@ public class CraftBlock implements Block {

6
patches/server/0002-Modify-POM.patch
View File

@ -5,17 +5,17 @@ Subject: [PATCH] Modify POM
diff --git a/pom.xml b/pom.xml
index 4f45b815860f3ab137c828c408f56030fc209ffe..bfe2ed3a3d48c8c0dced87620d1f4844f1d9911d 100644
index f009b05e4c2ab0f093150a9eecff5629db35b517..eb20fadc4c53d7f8e34f4f8e8caa58f943eaf4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuinity</artifactId>
+ <artifactId>yatopia</artifactId>
<packaging>jar</packaging>
<version>1.16.2-R0.1-SNAPSHOT</version>
<version>1.16.3-R0.1-SNAPSHOT</version>
- <name>Tuinity-Server</name>
- <url>https://github.com/Spottedleaf/Tuinity</url>
+ <name>Yatopia-Server</name>

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

@ -17,7 +17,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 8005f7eb073270a46f38601705ca4e89899015b1..4f228fd552b7edbb810dc85636123a9234b736e9 100644
index 3b7d648fea24bc07d56505123a59c4f8de6bb3dd..323d489b1e690500986bc0cbb4c2c93cc193bf70 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1519,7 +1519,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -133,7 +133,7 @@ index 0000000000000000000000000000000000000000..b0d5d8df1c1107294ee0cd7cbad27139
+}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 510e82002ed6ada5c2f4b14e01021068806a98e8..8bc7c1598807dc3c34355c347983047d13597670 100644
index 74aa903d3c362351f688979daa0c4f4145e582e4..d7b45169369d6463d1d0b0de0a62b32079da34ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -216,7 +216,7 @@ import javax.annotation.Nullable; // Paper
@ -146,7 +146,7 @@ index 510e82002ed6ada5c2f4b14e01021068806a98e8..8bc7c1598807dc3c34355c347983047d
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index a9728c6c538822b8c751b5d08f5fcd14031dbc77..69ab3c815e38a86fb33b30452220602e8ff2e1aa 100644
index b5ec7a161b22d0a0d39a6e60ce015cbf3520651a..7dae077f0e5f1658dfdc74cd4a391ee2eec88493 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -327,7 +327,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

4
patches/server/0005-Add-getLastTickMs-api.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add getLastTickMs api
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4f228fd552b7edbb810dc85636123a9234b736e9..2056048851cfd9e4e079cf2543e55f613e3a18cb 100644
index 323d489b1e690500986bc0cbb4c2c93cc193bf70..5274dcde8b06200357b11b77cc72ec415d4e47e4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -928,6 +928,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -28,7 +28,7 @@ index 4f228fd552b7edbb810dc85636123a9234b736e9..2056048851cfd9e4e079cf2543e55f61
this.X = true;
// Purpur start - tps catchup
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8bc7c1598807dc3c34355c347983047d13597670..2d32ab02d7edee9a964dc2d9248c0c769e7dcac8 100644
index d7b45169369d6463d1d0b0de0a62b32079da34ce..521e2e4923775aa5a198fd370818a9873019c102 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2417,4 +2417,11 @@ public final class CraftServer implements Server {

8
patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch
View File

@ -17,7 +17,7 @@ index b67f05f290db653cf75a89e85bd3decb5044a1e0..11758b6b158d971b9beb1b609d7513da
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index a60634fc455e8a59399020689b70eb64b6824d12..3601f6f104d204c10b4dacc013525651b128c2a8 100644
index 943273206e6123fdd101aafb6505a7c5bfe8d980..21058e0f08bd689901bcf51eef7198de791642f1 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -181,6 +181,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -37,7 +37,7 @@ index a60634fc455e8a59399020689b70eb64b6824d12..3601f6f104d204c10b4dacc013525651
this.setAllowFlight(dedicatedserverproperties.allowFlight);
this.setResourcePack(dedicatedserverproperties.resourcePack, this.aZ());
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fd3406f3b4457968d1a7cf8c9e9c79ef0c058538..ff6cbdcf91486b79c9d42d17675b2a1b9f8e7cad 100644
index 7083b379568fd101bec19469b60daf062bc4d137..0a7f88de5c5c307ed01c2f4a43336571f118736d 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 {
@ -423,7 +423,7 @@ index 0000000000000000000000000000000000000000..bf91f41cee803734bbee82d783705bf7
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2d32ab02d7edee9a964dc2d9248c0c769e7dcac8..d4e9558a8ababf3a611ebc55a84b0e76843137b5 100644
index 521e2e4923775aa5a198fd370818a9873019c102..c212d6069f1b9791805520a632dda2ad8770022d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -844,6 +844,7 @@ public final class CraftServer implements Server {
@ -449,7 +449,7 @@ index 2d32ab02d7edee9a964dc2d9248c0c769e7dcac8..d4e9558a8ababf3a611ebc55a84b0e76
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 132ad379242d9aa2defc639f79764050b73c572d..5387a50e4a24e2eb49693368c5342a69b8d14b69 100644
index 1acfbf3a63ee0e8d4bd4773f06b4be1e4961f527..4032f71f1eb916b9a004502eab9babfb0bcf0be2 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -169,6 +169,14 @@ public class Main {

4
patches/server/0007-Per-entity-type-collision-settings.patch
View File

@ -59,10 +59,10 @@ index cb344a424bf4c657bb1bbca286a1136c9b21b489..82fc63dbfc0d48267e0c1972a312b714
}
\ 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 ff6cbdcf91486b79c9d42d17675b2a1b9f8e7cad..00007e8b19567a9e1a364623e0bc091384c170b2 100644
index 0a7f88de5c5c307ed01c2f4a43336571f118736d..7e37d53a427563e319c00202bc7a076915e5cd37 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2860,7 +2860,7 @@ public abstract class EntityLiving extends Entity {
@@ -2861,7 +2861,7 @@ public abstract class EntityLiving extends Entity {
// Paper - end don't run getEntities if we're not going to use its result
// Tuinity start - reduce memory allocation from collideNearby
List<Entity> list = com.tuinity.tuinity.util.CachedLists.getTempGetEntitiesList();

2
patches/server/0009-Add-NBT-API-as-a-first-class-lib.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT API as a first-class lib
diff --git a/pom.xml b/pom.xml
index bfe2ed3a3d48c8c0dced87620d1f4844f1d9911d..b072a6a21ead442851ac5d511f5ddc83ca0eff48 100644
index eb20fadc4c53d7f8e34f4f8e8caa58f943eaf4e8..d8e7edc27dc1107272a87e7f9396f50136b662a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,10 @@

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

@ -39,10 +39,10 @@ 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 00007e8b19567a9e1a364623e0bc091384c170b2..45750f36bf51395ace76fd8f25b92a9e87581447 100644
index 7e37d53a427563e319c00202bc7a076915e5cd37..c7b66198ef8feb8ff09465d91207b3dcf1c1c85e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2579,10 +2579,12 @@ public abstract class EntityLiving extends Entity {
@@ -2580,10 +2580,12 @@ public abstract class EntityLiving extends Entity {
}

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 3c852d008737415337ef778d988d81ad633b201d..a2cff1c7a556fdd47e06059bc152ff3b9dd77d07 100644
index 2a8db362f007c25472b2114fd7a757a40a418e82..bba4675dc090d33cac09e2868e36935e4bc2550a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -43,9 +43,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

4
patches/server/0023-Redirect-Configs.patch
View File

@ -73,7 +73,7 @@ index 82fc63dbfc0d48267e0c1972a312b7143f62e6f0..7fc45446218ee6a31abca2e16d192eff
for (final Method method : clazz.getDeclaredMethods()) {
if (method.getReturnType() != void.class || method.getParameterCount() != 0 ||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 3601f6f104d204c10b4dacc013525651b128c2a8..6892b9de4552d78b01c57c0f67896a3cc62cb819 100644
index 21058e0f08bd689901bcf51eef7198de791642f1..f5a417bc349ee691a8d4b21eb39e6a6225ed96d9 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -189,6 +189,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -86,7 +86,7 @@ index 3601f6f104d204c10b4dacc013525651b128c2a8..6892b9de4552d78b01c57c0f67896a3c
this.setPVP(dedicatedserverproperties.pvp);
this.setAllowFlight(dedicatedserverproperties.allowFlight);
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 5387a50e4a24e2eb49693368c5342a69b8d14b69..6dd3a0e1dde1a114374f52e903d10e973b4ca44f 100644
index 4032f71f1eb916b9a004502eab9babfb0bcf0be2..dcbe92898db5297c9c74b482eefbcdb9aca2c1a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -310,7 +310,7 @@ public class Main {

4
patches/server/0027-Fix-lead-fall-dmg-config.patch
View File

@ -5,10 +5,10 @@ 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 5e4744e856596f1ef234e2c3b1e5d15a3adbd32a..9f9e564ebf2c052bc378ad93a2b03fb322e7dcdb 100644
index d413574045360c4724d2c84f1bbbf4d9abe53fe4..67bc0a002565571c9884560a859802465847d392 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1266,6 +1266,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1263,6 +1263,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.fallDistance = 0.0F;
} else if (d0 < 0.0D) {
this.fallDistance = (float) ((double) this.fallDistance - d0);

2
patches/server/0028-Optimize-player-loops-around-weather.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Optimize player loops around weather
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6aaa3e6b7e0919b85fbfbb0b70a647a18aeebfd7..d58d167217171e074c9f4e403991fded5565abfd 100644
index 6052ef1d4ede54cf23aa854298cbcd4f7e8ce9cf..c1f433bc287f0dc36d09194f3535aee5cf2d72cf 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -814,12 +814,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {

14
patches/server/0032-Add-timings-for-Pathfinder.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add timings for Pathfinder
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
index 85b25eace786fa0d7694afa405f9d2bdf4937b6e..2dca961498651b1c06ee61d33507055706afb63e 100644
index 68ab5ccb2fcfe1de0503c9336572f28e11832b2d..4d4c25cb328b0ca2e16d3c823214aca5854e4deb 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -54,6 +54,8 @@ public final class MinecraftTimings {
@ -18,18 +18,18 @@ index 85b25eace786fa0d7694afa405f9d2bdf4937b6e..2dca961498651b1c06ee61d335070557
* 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 ed37caf036ef9ae4c39622caf9b582678fecdccf..19753de35a3fef41fedd37eaab9f3ad2d5d91308 100644
index d26f8499460c7a26b4e26a39cf52c0d8d2510a80..888744131fd4b51d035be51aa0c9e3fb7e3997b4 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -28,6 +28,7 @@ public abstract class NavigationAbstract {
private int q;
@@ -29,6 +29,7 @@ public abstract class NavigationAbstract {
private float r;
private final Pathfinder s; public Pathfinder getPathfinder() { return this.s; } // Paper - OBFHELPER
private boolean t;
+ private co.aikar.timings.Timing timing; // Yatopia
// Tuinity start
public boolean isViableForPathRecalculationChecking() {
@@ -46,6 +47,7 @@ public abstract class NavigationAbstract {
@@ -47,6 +48,7 @@ public abstract class NavigationAbstract {
int i = MathHelper.floor(entityinsentient.b(GenericAttributes.FOLLOW_RANGE) * 16.0D);
this.s = this.a(i);
@ -37,7 +37,7 @@ index ed37caf036ef9ae4c39622caf9b582678fecdccf..19753de35a3fef41fedd37eaab9f3ad2
}
public void g() {
@@ -229,6 +231,10 @@ public abstract class NavigationAbstract {
@@ -230,6 +232,10 @@ public abstract class NavigationAbstract {
}
public void c() {
@ -48,7 +48,7 @@ index ed37caf036ef9ae4c39622caf9b582678fecdccf..19753de35a3fef41fedd37eaab9f3ad2
++this.e;
if (this.m) {
this.j();
@@ -256,6 +262,11 @@ public abstract class NavigationAbstract {
@@ -257,6 +263,11 @@ public abstract class NavigationAbstract {
this.a.getControllerMove().a(vec3d.x, this.b.getType(blockposition.down()).isAir() ? vec3d.y : PathfinderNormal.a((IBlockAccess) this.b, blockposition), vec3d.z, this.d);
}
}

8
patches/server/0035-lithium-collision-optimizations.patch
View File

@ -826,10 +826,10 @@ index ac6e5e3309affc830d4db07fd9b8d809c3085033..37a3b26cdeb02acb8051f0a99313de79
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9f9e564ebf2c052bc378ad93a2b03fb322e7dcdb..961ef2981f228460e9d6de8e9f7dae587d0e9d6b 100644
index 67bc0a002565571c9884560a859802465847d392..44393c7914c390183d3baa1736b59a334eab5944 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -75,7 +75,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -73,7 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
}
};
@ -1023,7 +1023,7 @@ index 8fd74f076713fa3ec289ee69d4d9a78f10139f8e..15df27eabfee965e6fd63ad74e5be9a9
sum += size;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d58d167217171e074c9f4e403991fded5565abfd..db2666d2cb03b5f8c714249ab9ebffa783fde334 100644
index c1f433bc287f0dc36d09194f3535aee5cf2d72cf..ce0ecfc0dc2986ab686dc3e474c4f5a25bb2bee1 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -649,8 +649,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -1041,7 +1041,7 @@ index d58d167217171e074c9f4e403991fded5565abfd..db2666d2cb03b5f8c714249ab9ebffa7
}
@Override
@@ -1744,12 +1750,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1765,12 +1771,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
// Spigot End
this.tileEntityListUnload.addAll(chunk.getTileEntities().values());

2
patches/server/0037-lithium-MixinChunkSection.patch
View File

@ -7,7 +7,7 @@ Original code by JellySquid, licensed under LGPLv3
you can find the original code on https://github.com/jellysquid3/lithium-fabric/ (Yarn mappings)
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 1d02880e5818d22c13d67d3f44844a2cca51c164..13f541390040d07229de0fbb1cfa4bcfe7d0794f 100644
index 5541531223456d9890dee154fec058314d56f256..c1f992b2ebac9819085bec74bc40ca3b5384c741 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -345,6 +345,8 @@ public abstract class BlockBase {

2
patches/server/0039-Load-also-the-chunk-that-you-re-teleporting-to.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Load also the chunk that you're teleporting to
Fixes Tuinity-178
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index db2666d2cb03b5f8c714249ab9ebffa783fde334..adda64b92b7ea1a62d18ebe81c9a5bc5547f21e0 100644
index ce0ecfc0dc2986ab686dc3e474c4f5a25bb2bee1..82a98a60d3ca06533fa3e6db53394fe6c6c77cb8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -225,7 +225,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

4
patches/server/0040-Highly-optimize-VillagePlace-filtering.patch
View File

@ -80,7 +80,7 @@ index b1ff30fb1569ddf59f46240266ce32f0aa96da1a..68deb623508326841cf750fca45b5384
}
diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java
index b46b20cae83e5e39ee2818c3d080b23b65bd1451..f724ca51511691f036cf03e07fea60653b1ef6cf 100644
index 2193fecab4406f49548c0952b2754269f91e2515..0785bfe1c28b63b492e25c678ebad89d4ed309eb 100644
--- a/src/main/java/net/minecraft/server/PersistentRaid.java
+++ b/src/main/java/net/minecraft/server/PersistentRaid.java
@@ -68,7 +68,7 @@ public class PersistentRaid extends PersistentBase {
@ -90,7 +90,7 @@ index b46b20cae83e5e39ee2818c3d080b23b65bd1451..f724ca51511691f036cf03e07fea6065
- List<VillagePlaceRecord> list = (List) this.b.y().c(VillagePlaceType.b, blockposition, 64, VillagePlace.Occupancy.IS_OCCUPIED).collect(Collectors.toList());
+ List<VillagePlaceRecord> list = this.b.y().cList(VillagePlaceType.b, blockposition, 64, VillagePlace.Occupancy.IS_OCCUPIED); // Yatopia
int i = 0;
Vec3D vec3d = Vec3D.a;
Vec3D vec3d = Vec3D.ORIGIN;
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index d861368550a8811eb442c30c508023f6029daa4a..e337b62eafafba3dcb5d0bddf16237c78b8aa6e2 100644

8
patches/server/0041-Nuke-streams-off-BlockPosition.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Nuke streams off BlockPosition
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 13f541390040d07229de0fbb1cfa4bcfe7d0794f..575f1f40a99871bab59f301072ada056628b37ff 100644
index c1f992b2ebac9819085bec74bc40ca3b5384c741..462d3431367f97f9d8506fd1a1adf8dc418b4414 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -637,6 +637,7 @@ public abstract class BlockBase {
@ -89,10 +89,10 @@ index e6b5a21c523c598f53207d024322301fbae74825..5e0aa6e35b1d4e23fdf42add15420665
return a(MathHelper.floor(axisalignedbb.minX), MathHelper.floor(axisalignedbb.minY), MathHelper.floor(axisalignedbb.minZ), MathHelper.floor(axisalignedbb.maxX), MathHelper.floor(axisalignedbb.maxY), MathHelper.floor(axisalignedbb.maxZ));
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 961ef2981f228460e9d6de8e9f7dae587d0e9d6b..344177bc815264e07a3695d9f0c3a1cd90899aa7 100644
index 44393c7914c390183d3baa1736b59a334eab5944..07ae7f9592d78b3e0f0dd7ef543e8c8ac10543ca 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -804,11 +804,25 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -801,11 +801,25 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
float f2 = this.getBlockSpeedFactor();
this.setMot(this.getMot().d((double) f2, 1.0D, (double) f2));
@ -119,7 +119,7 @@ index 961ef2981f228460e9d6de8e9f7dae587d0e9d6b..344177bc815264e07a3695d9f0c3a1cd
if (this.aF() && this.isBurning()) {
this.playSound(SoundEffects.ENTITY_GENERIC_EXTINGUISH_FIRE, 0.7F, 1.6F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F);
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 5c2f6b0454f44c4b85cfd6d06eee584dfa0e0c6d..146e5c2cecde8585ade47b0b62c55f099f2513b6 100644
index b6cace72ab2f3389408a5e528981fcff3b511180..722e3536e1e0837de2b7c36c3371f68091f71554 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -377,9 +377,24 @@ public class EntityFishingHook extends IProjectile {

6
patches/server/0047-Give-them-items-motion.patch
View File

@ -5,15 +5,15 @@ Subject: [PATCH] Give them items motion
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 344177bc815264e07a3695d9f0c3a1cd90899aa7..dff2bd940a327061aa906a5e26646b09cc0b23b8 100644
index 07ae7f9592d78b3e0f0dd7ef543e8c8ac10543ca..ebe17a86dc340338fb4b4f1a5112bce8cc46dfd2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1551,7 +1551,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1548,7 +1548,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public void setPositionRotation(double d0, double d1, double d2, float f, float f1) {
- this.mot = new Vec3D(0, 0, 0); // Paper - cancel entity velocity if teleported
+ if (this instanceof EntityPlayer) { this.mot = Vec3D.a; } // Paper - cancel entity velocity if teleported // Yatopia - fix PaperMC-4292
+ if (this instanceof EntityPlayer) { this.mot = Vec3D.ORIGIN; } // Paper - cancel entity velocity if teleported // Yatopia - fix PaperMC-4292
this.g(d0, d1, d2);
this.yaw = f;
this.pitch = f1;

4
patches/server/0048-Fix-LightEngineThreaded-memory-leak.patch
View File

@ -18,10 +18,10 @@ index ceaa92400678aef3bf436279dd807e4b38609dda..d9bbac17c5767df638fc4464e9795d5c
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 adda64b92b7ea1a62d18ebe81c9a5bc5547f21e0..e5031225b3da2899686067dca97baa1baa478719 100644
index 82a98a60d3ca06533fa3e6db53394fe6c6c77cb8..fd8aacc3a158093e524d2bc552a3c2fdc9135ecf 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1787,6 +1787,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1808,6 +1808,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
// Paper end

8
scripts/fetchUpstream.sh
View File

@ -17,16 +17,16 @@ function updateAll {
update Akarin 1.16.2
update Empirecraft ver/1.16.2
update Origami 1.16
update Purpur ver/1.16.2
update Purpur ver/1.16.3
update Rainforest ver/1.16
update Tuinity ver/1.16.2
update Tuinity ver/1.16.3
git submodule update --recursive
}
if [ -z "$1" ]; then
updateAll
elif [ "$1" == "true" ]; then
update Tuinity ver/1.16.2
update Tuinity ver/1.16.3
git submodule update --recursive
elif [ "$1" == "false" ]; then
if [ "$2" == "true" ]; then
@ -36,7 +36,7 @@ elif [ "$1" == "false" ]; then
git clean -fx
git clean -fd
git fetch
git reset --hard origin/ver/1.16.2
git reset --hard origin/ver/1.16.3
git submodule update --init --recursive -f
else
updateAll