9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-28 03:19:22 +00:00

Fix error in rebase

This commit is contained in:
violetc
2022-08-17 10:31:39 +08:00
parent 0160d7eb95
commit b5569bd501
22 changed files with 50 additions and 45 deletions

View File

@@ -151,10 +151,10 @@ index 4cdfc433df67afcd455422e9baf56f167dd712ae..a6e0f5dab21d806e0c7744b2a337cded
private void ensureActiveIsNotIterated() {
// Paper - replace with better logic, do not delay removals
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 5665b792dff1e6ddf2d5f92a9391a244453851c0..b7fae62f76059a0b8e8f3670cd3429b64c906de9 100644
index 857b8881ba2d526ee366aa04228b72bc8d7c8c47..7430ba59d0d16c628a7c62100902e23b0470b419 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -217,7 +217,12 @@ public final class LeavesConfig {
@@ -222,7 +222,12 @@ public final class LeavesConfig {
}
noChatSign = getBoolean("settings.misc.no-chat-sign", noChatSign);
}