mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-11-14 14:45:48 +01:00
c4a68471e4
* Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur) 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. Paper Changes: d80e43647 [CI-SKIP] Removal from the MIT list (#5345) Tuinity Changes: c303521 Change license from MIT to LGPLv3 Purpur Changes: 3044036 Re-enable timings by default 4f85cbe Include all Airplane patches 7b5feba [ci-skip] Tuinity license change 210ff8f [ci-skip] revert last commit. wasnt what i thought it was :3 47e8965 [ci-skip] Add maven repositories for Adventure API 3930ac4 It's muffin time! e535225 Updated Upstream (Paper & Tuinity) * whoops * this actually fixes it (I was being stupid) * [CI-SKIP] fix akarin link in Licensing/LICENSE.md * Updated Upstream and Sidestream(s) (Paper/Airplane/Akarin/Empirecraft) 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. Paper Changes: 39c487b37 Add per-command perms for paper command cdbf2578c Add Item Rarity API (#5352) Airplane Changes: 5df9825 Remove iterators from inventory contains 18d2be1 Merge pull request #14 from violetwtf/patch-1 f716d4c Merge pull request #13 from violetwtf/master 128cbe5 Reduce entity chunk ticking checks from 3 to 1 03ac093 Skip copying unloading tile entities 97dd027 Smaller pool size for tracking 9e9f57b Only set up Flare if token is available 580f380 Updated Upstream (Tuinity) 97df206 Update README to reflect support changes cf161dd Change blog URL to more helpful one Akarin Changes: 6be3d57 Update Jenkinsfile 3aa2e99 Merge pull request #198 from HookWoods/ver/1.16.5 c548038 try to fix velocity repo 5b03eb1 Update patches to 1.16.5 Empirecraft Changes: 81545aaf Updated Paper Airplane Changes: 82253fd Early return optimization for target finding 9572643 Cache entityhuman display name * Updated Upstream and Sidestream(s) (Tuinity/Purpur/Airplane) 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: aea6b83 Merge dev/playerchunkloading 722c7ca Use hash table for maintaing changed block set 98ae59d Custom table implementation for blockstate state lookups 8b8704f Oprimise map impl for tracked players ea71d6b Optimise snow & ice in chunk ticking 9871d4c Remove chunk lookup & lambda allocation from counting mobs 5a4a35f Add patreon 7d93d96 Refactor data management for region manager Purpur Changes: 37591fe Add config to use no-tick vd for tracker (#195) Airplane Changes: cc00c69 Updated Upstream (Tuinity)
47 lines
2.8 KiB
Diff
47 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ivan Pekov <ivan@mrivanplays.com>
|
|
Date: Wed, 23 Dec 2020 08:42:18 +0200
|
|
Subject: [PATCH] Configurable enchanting table tick
|
|
|
|
Also don't tick blockentity beehive if there are no bees in it.
|
|
This patch is a leftover from the original tile entity optimisations, which was majorly flawed.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityBeehive.java b/src/main/java/net/minecraft/server/TileEntityBeehive.java
|
|
index 598f78502cd7ad15bc0f678df277f91b3ae376d4..69ef94e887fa9da1b3ddaf0a345fecc49d2866b5 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityBeehive.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityBeehive.java
|
|
@@ -285,6 +285,7 @@ public class TileEntityBeehive extends TileEntity implements ITickable {
|
|
|
|
@Override
|
|
public void tick() {
|
|
+ if (this.bees.size() == 0) { return; } // Yatopia - TE optimizations
|
|
if (!this.world.isClientSide) {
|
|
this.y();
|
|
BlockPosition blockposition = this.getPosition();
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityEnchantTable.java b/src/main/java/net/minecraft/server/TileEntityEnchantTable.java
|
|
index 9b0c75332d9815657d96183e51e40cf14ee3ed75..e3de65b58a599b375b3be7470d918038b5379471 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityEnchantTable.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityEnchantTable.java
|
|
@@ -43,6 +43,7 @@ public class TileEntityEnchantTable extends TileEntity implements INamableTileEn
|
|
|
|
@Override
|
|
public void tick() {
|
|
+ if (!org.yatopiamc.yatopia.server.YatopiaConfig.shouldTickEnchantingTables) { return; } // Yatopia - TE optimizations
|
|
this.j = this.i;
|
|
this.l = this.k;
|
|
EntityHuman entityhuman = this.world.a((double) this.position.getX() + 0.5D, (double) this.position.getY() + 0.5D, (double) this.position.getZ() + 0.5D, 3.0D, false);
|
|
diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
index 78decc9c7483f42acb65f342f12fc1d644440822..890247fadf69dabce6d1c23ba887f93ae5121e1e 100644
|
|
--- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
+++ b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
|
|
@@ -260,4 +260,9 @@ public class YatopiaConfig {
|
|
checkVehicleMovedQuickly = getBoolean("settings.checks.vehicle-moved-quickly", checkVehicleMovedQuickly);
|
|
checkVehicleMovedWrongly = getBoolean("settings.checks.vehicle-moved-wrongly", checkVehicleMovedWrongly);
|
|
}
|
|
+
|
|
+ public static boolean shouldTickEnchantingTables = false;
|
|
+ private static void tickEnchantingTables() {
|
|
+ shouldTickEnchantingTables = getBoolean("settings.tick.enchanting-tables", shouldTickEnchantingTables);
|
|
+ }
|
|
}
|