Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
f3baa0b8
Commit
f3baa0b8
authored
Jul 29, 2022
by
Someone999
Browse files
Changed charset of FileReader in ConfigContainer from default to utf-8.
parent
66dadece
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/config/ConfigContainer.java
View file @
f3baa0b8
...
@@ -5,6 +5,7 @@ import emu.grasscutter.Grasscutter;
...
@@ -5,6 +5,7 @@ import emu.grasscutter.Grasscutter;
import
emu.grasscutter.Grasscutter.ServerDebugMode
;
import
emu.grasscutter.Grasscutter.ServerDebugMode
;
import
emu.grasscutter.Grasscutter.ServerRunMode
;
import
emu.grasscutter.Grasscutter.ServerRunMode
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Set
;
import
java.util.Set
;
import
java.io.FileReader
;
import
java.io.FileReader
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Field
;
...
@@ -27,7 +28,7 @@ public class ConfigContainer {
...
@@ -27,7 +28,7 @@ public class ConfigContainer {
public
static
void
updateConfig
()
{
public
static
void
updateConfig
()
{
try
{
// Check if the server is using a legacy config.
try
{
// Check if the server is using a legacy config.
JsonObject
configObject
=
Grasscutter
.
getGsonFactory
()
JsonObject
configObject
=
Grasscutter
.
getGsonFactory
()
.
fromJson
(
new
FileReader
(
Grasscutter
.
configFile
),
JsonObject
.
class
);
.
fromJson
(
new
FileReader
(
Grasscutter
.
configFile
,
StandardCharsets
.
UTF_8
),
JsonObject
.
class
);
if
(!
configObject
.
has
(
"version"
))
{
if
(!
configObject
.
has
(
"version"
))
{
Grasscutter
.
getLogger
().
info
(
"Updating legacy .."
);
Grasscutter
.
getLogger
().
info
(
"Updating legacy .."
);
Grasscutter
.
saveConfig
(
null
);
Grasscutter
.
saveConfig
(
null
);
...
@@ -121,7 +122,7 @@ public class ConfigContainer {
...
@@ -121,7 +122,7 @@ public class ConfigContainer {
public
static
class
HTTP
{
public
static
class
HTTP
{
public
String
bindAddress
=
"0.0.0.0"
;
public
String
bindAddress
=
"0.0.0.0"
;
public
int
bindPort
=
443
;
public
int
bindPort
=
443
;
/* This is the address used in URLs. */
/* This is the address used in URLs. */
public
String
accessAddress
=
"127.0.0.1"
;
public
String
accessAddress
=
"127.0.0.1"
;
/* This is the port used in URLs. */
/* This is the port used in URLs. */
...
@@ -145,7 +146,7 @@ public class ConfigContainer {
...
@@ -145,7 +146,7 @@ public class ConfigContainer {
public
int
loadEntitiesForPlayerRange
=
100
;
public
int
loadEntitiesForPlayerRange
=
100
;
public
boolean
enableScriptInBigWorld
=
false
;
public
boolean
enableScriptInBigWorld
=
false
;
public
boolean
enableConsole
=
true
;
public
boolean
enableConsole
=
true
;
/* Kcp internal work interval (milliseconds) */
/* Kcp internal work interval (milliseconds) */
public
int
kcpInterval
=
20
;
public
int
kcpInterval
=
20
;
/* Controls whether packets should be logged in console or not */
/* Controls whether packets should be logged in console or not */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment