From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mykyta Komarnytskyy Date: Sat, 24 Oct 2020 21:08:17 -0500 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 de0923395dce3571e604b24d420da48cbe5b9cf4..f1333f2fcdf9f934645dc8b2d086f8cb2d6c72c7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -433,6 +433,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected void a(IBlockData iblockdata) { + if (org.yatopiamc.yatopia.server.YatopiaConfig.criterionTriggerEnterBlock) // Yatopia CriterionTriggers.d.a(this, iblockdata); } @@ -575,7 +576,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.playerConnection.sendPacket(new PacketPlayOutExperience(this.exp, this.expTotal, this.expLevel)); } - if (this.ticksLived % 20 == 0) { + if (org.yatopiamc.yatopia.server.YatopiaConfig.criterionTriggerLocation && this.ticksLived % 20 == 0) { // Yatopia CriterionTriggers.p.a(this); } diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java index 2e08558eef23d40b3a704250dfe12bb7f4b660f3..5578f5784a87019d3f091173b25b5ec1cc059fd6 100644 --- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java +++ b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java @@ -258,4 +258,14 @@ public class YatopiaConfig { private static void intervals() { playerTimeStatisticsInterval = Math.max(1, getInt("settings.intervals.player-time-statistics", 1)); } + + public static boolean criterionTriggerLocation = true; + public static boolean criterionTriggerEnterBlock = true; + public static boolean criterionTriggerTick = true; + private static void criterionTriggers() { + criterionTriggerLocation = getBoolean("settings.criterion-triggers.location", true); + criterionTriggerEnterBlock = getBoolean("settings.criterion-triggers.enter-block", true); + criterionTriggerTick = getBoolean("settings.criterion-triggers.tick", true); + } + }