Merge branch 'master' into netty

2021-07-11 15:20:00 +02:00
parent fcb43af8e3 0d887dc5dc
commit 86224f5152
1103 changed files with 4100 additions and 163889 deletions
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -985,7 +985,6 @@ public class Server {
    }

    public static void main(String[] args) {
-        System.setProperty("wzpath", "wz");
        Security.setProperty("crypto.policy", "unlimited");
        AutoJCE.removeCryptographyRestrictions();
        Server.getInstance().init();