mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-20 23:39:29 +00:00
Do not log plugin library loads
This commit is contained in:
84
patches/api/0004-Do-not-log-plugin-library-loads.patch
Normal file
84
patches/api/0004-Do-not-log-plugin-library-loads.patch
Normal file
@@ -0,0 +1,84 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Tue, 8 Aug 2023 18:39:55 +0200
|
||||
Subject: [PATCH] Do not log plugin library loads
|
||||
|
||||
License: MIT (https://opensource.org/licenses/MIT)
|
||||
Gale - https://galemc.org
|
||||
|
||||
This patch is based on the following patch:
|
||||
"Add log suppression for LibraryLoader"
|
||||
By: Krakenied <Krakenied1@gmail.com>
|
||||
As part of: Purpur (https://github.com/PurpurMC/Purpur)
|
||||
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
||||
|
||||
* Purpur copyright *
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2019-2022 PurpurMC
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..12fe20a5a05dc3780def4c0cb3de0b291c2a8185 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -56,6 +56,13 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||
private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
|
||||
private final LibraryLoader libraryLoader;
|
||||
|
||||
+ // Gale start - Purpur - do not log plugin library loads
|
||||
+ public static boolean SuppressLibraryLoaderLogger = false; // This is not set by Gale, but is included for compatibility with Purpur plugins
|
||||
+ public static boolean logDownloads = true;
|
||||
+ public static boolean logStartLoadLibrariesForPlugin = true;
|
||||
+ public static boolean logLibrariesLoaded = true;
|
||||
+ // Gale end - Purpur - do not log plugin library loads
|
||||
+
|
||||
/**
|
||||
* This class was not meant to be constructed explicitly
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||
index e4b6f278a811acbb0070e311c5c3bdaff7b00474..354abafef044532bacfbc55d1d7355528c960df9 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||
@@ -65,6 +65,7 @@ public class LibraryLoader
|
||||
@Override
|
||||
public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
|
||||
{
|
||||
+ if (JavaPluginLoader.logDownloads && !JavaPluginLoader.SuppressLibraryLoaderLogger) // Gale - Purpur - do not log plugin library loads
|
||||
logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
|
||||
}
|
||||
} );
|
||||
@@ -80,6 +81,7 @@ public class LibraryLoader
|
||||
{
|
||||
return null;
|
||||
}
|
||||
+ if (JavaPluginLoader.logStartLoadLibrariesForPlugin && !JavaPluginLoader.SuppressLibraryLoaderLogger) // Gale - Purpur - do not log plugin library loads
|
||||
logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
||||
{
|
||||
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
||||
@@ -118,6 +120,7 @@ public class LibraryLoader
|
||||
}
|
||||
|
||||
jarFiles.add( url );
|
||||
+ if (JavaPluginLoader.logLibrariesLoaded && !JavaPluginLoader.SuppressLibraryLoaderLogger) // Gale - Purpur - do not log plugin library loads
|
||||
logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[]
|
||||
{
|
||||
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), file // Paper - use configured log prefix
|
||||
75
patches/server/0062-Do-not-log-plugin-library-loads.patch
Normal file
75
patches/server/0062-Do-not-log-plugin-library-loads.patch
Normal file
@@ -0,0 +1,75 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Tue, 8 Aug 2023 18:24:01 +0200
|
||||
Subject: [PATCH] Do not log plugin library loads
|
||||
|
||||
License: MIT (https://opensource.org/licenses/MIT)
|
||||
Gale - https://galemc.org
|
||||
|
||||
This patch is based on the following patch:
|
||||
"Add log suppression for LibraryLoader"
|
||||
By: Krakenied <Krakenied1@gmail.com>
|
||||
As part of: Purpur (https://github.com/PurpurMC/Purpur)
|
||||
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
||||
|
||||
* Purpur copyright *
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2019-2022 PurpurMC
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 241431b3d118e402e98710929102c7502af813bf..aac521e0bf2ecda0d750ef3a209af6b6c730c102 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -4,6 +4,7 @@ package org.galemc.gale.configuration;
|
||||
|
||||
import io.papermc.paper.configuration.Configuration;
|
||||
import io.papermc.paper.configuration.ConfigurationPart;
|
||||
+import org.bukkit.plugin.java.JavaPluginLoader;
|
||||
import org.spongepowered.configurate.objectmapping.meta.Setting;
|
||||
|
||||
@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
|
||||
@@ -113,6 +114,24 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
|
||||
}
|
||||
|
||||
+ // Gale start - Purpur - do not log plugin library loads
|
||||
+ public PluginLibraryLoader pluginLibraryLoader;
|
||||
+ public class PluginLibraryLoader extends ConfigurationPart.Post {
|
||||
+
|
||||
+ public boolean downloads = true;
|
||||
+ public boolean startLoadLibrariesForPlugin = true;
|
||||
+ public boolean librariesLoaded = true;
|
||||
+
|
||||
+ @Override
|
||||
+ public void postProcess() {
|
||||
+ JavaPluginLoader.logDownloads = this.downloads;
|
||||
+ JavaPluginLoader.logStartLoadLibrariesForPlugin = this.startLoadLibrariesForPlugin;
|
||||
+ JavaPluginLoader.logLibrariesLoaded = this.librariesLoaded;
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
+ // Gale end - Purpur - do not log plugin library loads
|
||||
+
|
||||
}
|
||||
|
||||
}
|
||||
@@ -28,14 +28,14 @@ index c0a80824a0307ea673805015119cc834b268f0dc..d7c6e90ccf3a8ce58e5533c5158ce626
|
||||
|
||||
return playerChatMessage;
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 241431b3d118e402e98710929102c7502af813bf..cd15e6db2f266a3221a26c344bf67af6ad7b79c7 100644
|
||||
index aac521e0bf2ecda0d750ef3a209af6b6c730c102..d172c2165197e553198edb6d7dcc3a9796c35b1e 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -111,6 +111,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -112,6 +112,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public Chat chat;
|
||||
public class Chat extends ConfigurationPart {
|
||||
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
|
||||
+ public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
|
||||
}
|
||||
|
||||
}
|
||||
// Gale start - Purpur - do not log plugin library loads
|
||||
@@ -20,14 +20,14 @@ index 6257e19bc6cfeae300babb99730361dfcd7459d2..a72876beab9a0522ef3239b718e5be29
|
||||
this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca
|
||||
}); // Paper - push to main
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index cd15e6db2f266a3221a26c344bf67af6ad7b79c7..91e02aa9bdd1ac68a883c1c0a0c70c51c37ce491 100644
|
||||
index d172c2165197e553198edb6d7dcc3a9796c35b1e..785bc2c67aadf2062802a998a96af3b139468386 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -112,6 +112,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -113,6 +113,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public class Chat extends ConfigurationPart {
|
||||
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
|
||||
public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
|
||||
+ public boolean outOfOrderMessageWarning = false; // Gale - do not log out-of-order message warnings
|
||||
}
|
||||
|
||||
}
|
||||
// Gale start - Purpur - do not log plugin library loads
|
||||
@@ -49,14 +49,14 @@ index 22697de39b8d00a522689d5abf894621cf051c89..cf717e46b82d8842c97d2c8aa172d02b
|
||||
boolean flag1 = false;
|
||||
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 91e02aa9bdd1ac68a883c1c0a0c70c51c37ce491..8692e7eb8b2b08fc3c5132adcc4262759f579da2 100644
|
||||
index 785bc2c67aadf2062802a998a96af3b139468386..c7622ff665c066b22c331d887a9f052f704e81e7 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -113,6 +113,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -114,6 +114,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
|
||||
public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
|
||||
public boolean outOfOrderMessageWarning = false; // Gale - do not log out-of-order message warnings
|
||||
+ public boolean notSecureMarker = true; // Gale - do not log Not Secure marker
|
||||
}
|
||||
|
||||
}
|
||||
// Gale start - Purpur - do not log plugin library loads
|
||||
@@ -44,10 +44,10 @@ index 2ff578e4a953ffcf5176815ba8e3f06f73499989..0d034a1b810e3840055a10ca1960eecb
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 8692e7eb8b2b08fc3c5132adcc4262759f579da2..8bf9763c9c359cfc45d1c866d667fa01e6bd0bf6 100644
|
||||
index c7622ff665c066b22c331d887a9f052f704e81e7..4cb41ab602b05a4d2b7639c86780127d1d122a50 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -107,6 +107,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -108,6 +108,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
|
||||
public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
|
||||
public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization
|
||||
@@ -39,14 +39,15 @@ index d2b4654a9095a678bbc9e004af969cf54da0fcab..d797bac97ec1adec7a25a26c8e052e70
|
||||
});
|
||||
this.rotation = Rotation.valueOf(nbt.getString("rotation"));
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 8bf9763c9c359cfc45d1c866d667fa01e6bd0bf6..80d8766057869f0c50605340e4a516ebf120d358 100644
|
||||
index 4cb41ab602b05a4d2b7639c86780127d1d122a50..d95a31a441cd2046e96dfcf7402bc9a526e0524d 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -4,8 +4,12 @@ package org.galemc.gale.configuration;
|
||||
@@ -4,9 +4,13 @@ package org.galemc.gale.configuration;
|
||||
|
||||
import io.papermc.paper.configuration.Configuration;
|
||||
import io.papermc.paper.configuration.ConfigurationPart;
|
||||
+import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
|
||||
import org.bukkit.plugin.java.JavaPluginLoader;
|
||||
import org.spongepowered.configurate.objectmapping.meta.Setting;
|
||||
|
||||
+import java.util.Locale;
|
||||
@@ -55,7 +56,7 @@ index 8bf9763c9c359cfc45d1c866d667fa01e6bd0bf6..80d8766057869f0c50605340e4a516eb
|
||||
@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
|
||||
public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
static final int CURRENT_VERSION = 1;
|
||||
@@ -100,7 +104,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -101,7 +105,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
}
|
||||
|
||||
public LogToConsole logToConsole;
|
||||
@@ -64,9 +65,9 @@ index 8bf9763c9c359cfc45d1c866d667fa01e6bd0bf6..80d8766057869f0c50605340e4a516eb
|
||||
|
||||
public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
|
||||
public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
|
||||
@@ -117,6 +121,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public boolean notSecureMarker = true; // Gale - do not log Not Secure marker
|
||||
@@ -136,6 +140,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
}
|
||||
// Gale end - Purpur - do not log plugin library loads
|
||||
|
||||
+ // Gale start - EMC - softly log invalid pool element errors
|
||||
+ public String invalidPoolElementErrorLogLevel = "info";
|
||||
@@ -31,10 +31,10 @@ index cf717e46b82d8842c97d2c8aa172d02bb788184a..4c5d2c3e50be81435260207dc1208c08
|
||||
|
||||
public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 80d8766057869f0c50605340e4a516ebf120d358..13961140b8027996c393bd6d14a89b18b5d7ce7e 100644
|
||||
index d95a31a441cd2046e96dfcf7402bc9a526e0524d..23f54f116ba0c4d7442571a6713e5f9f41eb8886 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -112,6 +112,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -113,6 +113,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
|
||||
public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization
|
||||
public boolean nullIdDisconnections = true; // Gale - Pufferfish - do not log disconnections with null id
|
||||
@@ -109,10 +109,10 @@ index c51aee272b5cc991fec5fd0242f493ab6e9e4b32..4633aaf37dad0348191880f3d4cd91c4
|
||||
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
|
||||
int i = (int) (Util.getMillis() - this.keepAliveTime);
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 13961140b8027996c393bd6d14a89b18b5d7ce7e..f7e016899cf74db72a94eeaa22ee2abc6d9426f1 100644
|
||||
index 23f54f116ba0c4d7442571a6713e5f9f41eb8886..be93695a82d79c55d8e6b747b80139d8994032bb 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -101,6 +101,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -102,6 +102,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
|
||||
}
|
||||
|
||||
@@ -23,10 +23,10 @@ index 00166d86baad60beed5896871c9b9118fefc20b6..ded7811cd10bc436957ed9f1576f3231
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index f7e016899cf74db72a94eeaa22ee2abc6d9426f1..2cc90a79b13f11405b3d21320c18d294c15c4822 100644
|
||||
index be93695a82d79c55d8e6b747b80139d8994032bb..2a3b50e09883aad815b88e5b4c87aa20942a20ed 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -66,6 +66,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -67,6 +67,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public boolean verifyChatOrder = true;
|
||||
// Gale end - Pufferfish - make chat order verification configurable
|
||||
|
||||
@@ -46,10 +46,10 @@ index cc7222cc7e53e8ae693e4e94ad53391db7a663c4..9d1d7033fdd2ae65b8fd323e9199b9d5
|
||||
continue;
|
||||
}
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 2cc90a79b13f11405b3d21320c18d294c15c4822..2123a003097edce4c100945a3cca706a8b0d696f 100644
|
||||
index 2a3b50e09883aad815b88e5b4c87aa20942a20ed..1c0d4dbd642c03f25fa8c4bb0f5880e038960d84 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -80,6 +80,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -81,6 +81,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public int premiumAccountSlowLoginTimeout = -1;
|
||||
// Gale end - make slow login timeout configurable
|
||||
|
||||
@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 2123a003097edce4c100945a3cca706a8b0d696f..6f168b52e6db0cddc5941e8c7d8e3b4029eec95a 100644
|
||||
index 1c0d4dbd642c03f25fa8c4bb0f5880e038960d84..effe25e646dcd46831df44605c0fabd67ea726d3 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -135,6 +135,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -136,6 +136,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
|
||||
}
|
||||
|
||||
@@ -87,10 +87,10 @@ index af8b5282df19c92c5f1394dc9d889012ce509f32..f070bd0eca4a55445f436c9520a89aab
|
||||
|
||||
int i = 29999999;
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
index 6f168b52e6db0cddc5941e8c7d8e3b4029eec95a..de4ee51bdd323c7c1f6297e933fe4117792c52e8 100644
|
||||
index effe25e646dcd46831df44605c0fabd67ea726d3..2ea8fbfe9b286e91b9e073a77abb6706f2bb26ae 100644
|
||||
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
||||
@@ -27,7 +27,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
@@ -28,7 +28,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
||||
public SmallOptimizations smallOptimizations;
|
||||
public class SmallOptimizations extends ConfigurationPart {
|
||||
|
||||
Reference in New Issue
Block a user