From 245f4cf0812890950eafbf88a5fcb9d956545ed8 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Tue, 26 Jan 2016 22:11:57 +0100 Subject: [PATCH 1/4] [CLEANUP] Added debug for local servers --- .../java/org/parabot/core/parsers/servers/LocalServers.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/core/parsers/servers/LocalServers.java b/src/main/java/org/parabot/core/parsers/servers/LocalServers.java index a1dc8a6..96c0e14 100644 --- a/src/main/java/org/parabot/core/parsers/servers/LocalServers.java +++ b/src/main/java/org/parabot/core/parsers/servers/LocalServers.java @@ -87,6 +87,7 @@ public class LocalServers extends ServerParser { } for (File file : Directories.listJSONFiles(Directories.getServerPath())){ + Core.verbose("[Local server in]: " + file.getName()); try { JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(new FileReader(file)); String name = (String) object.get("name"); @@ -104,9 +105,9 @@ public class LocalServers extends ServerParser { String provider = (String) locations.get("provider"); String hooks = (String) locations.get("hooks"); + Core.verbose("[Local server]: " + name); ServerProviderInfo serverProviderInfo = new ServerProviderInfo(server, hooks, name, clientClass, bankTabs); - System.out.println(server); ServerDescription desc = new ServerDescription(name, author, version); SERVER_CACHE.put(desc, new LocalPublicServerExecuter(name, serverProviderInfo, server, provider)); From 489bf495e12cb111f5fed773771dc1b61b27ba0e Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Tue, 26 Jan 2016 22:12:11 +0100 Subject: [PATCH 2/4] [BUGFIX] Solved issues with clients that don't have a webclient --- src/main/java/org/parabot/core/asm/ASMClassLoader.java | 7 ++++++- .../org/parabot/core/asm/adapters/AddSuperAdapter.java | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/core/asm/ASMClassLoader.java b/src/main/java/org/parabot/core/asm/ASMClassLoader.java index c7d03c0..ee0478d 100644 --- a/src/main/java/org/parabot/core/asm/ASMClassLoader.java +++ b/src/main/java/org/parabot/core/asm/ASMClassLoader.java @@ -88,7 +88,12 @@ public class ASMClassLoader extends ClassLoader { } private final ProtectionDomain getDomain() { - CodeSource code = new CodeSource(null, (Certificate[]) null); + CodeSource code = null; + try { + code = new CodeSource(new URL("http://www.url.com/"), (Certificate[]) null); + } catch (MalformedURLException e) { + e.printStackTrace(); + } return new ProtectionDomain(code, getPermissions()); } diff --git a/src/main/java/org/parabot/core/asm/adapters/AddSuperAdapter.java b/src/main/java/org/parabot/core/asm/adapters/AddSuperAdapter.java index 55067a7..68b8aef 100644 --- a/src/main/java/org/parabot/core/asm/adapters/AddSuperAdapter.java +++ b/src/main/java/org/parabot/core/asm/adapters/AddSuperAdapter.java @@ -49,7 +49,9 @@ public class AddSuperAdapter implements Injectable { AbstractInsnNode ain = (AbstractInsnNode) ili.next(); if (ain.getOpcode() == Opcodes.INVOKESPECIAL) { MethodInsnNode min = (MethodInsnNode) ain; - min.owner = superClass; + if(!min.owner.equals(node.name)) { + min.owner = superClass; + } break; } } From 0b364a2d84a41ce7e770b87f378164463731e511 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Tue, 26 Jan 2016 22:12:46 +0100 Subject: [PATCH 3/4] [TASK] Adjusted version to 2.4.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d82d201..090fdf9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot client - 2.4.3.2 + 2.4.5 jar From a770852399b513b996b080462c7b714ad6f313bc Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Tue, 26 Jan 2016 22:16:51 +0100 Subject: [PATCH 4/4] [CLEANUP] Fixed issues in pom.xml --- deploy/deploy.bat | 2 +- pom.xml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deploy/deploy.bat b/deploy/deploy.bat index 0ed46fe..5ad3b36 100644 --- a/deploy/deploy.bat +++ b/deploy/deploy.bat @@ -1,4 +1,4 @@ -mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/${project.build.finalName}-fat.jar -DlocalRepositoryPath=../../Maven-Repository +mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/${project.build.finalName}-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository diff --git a/pom.xml b/pom.xml index 090fdf9..2fd0d1e 100644 --- a/pom.xml +++ b/pom.xml @@ -84,14 +84,14 @@ deploy true - - deploy.bat - package.bat - clean.bat - - - - + + + + + + + deploy.bat +