2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-07 08:39:12 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #50 from Parabot/development

Browse Source 
Development
This commit is contained in:
Jeroen Ketelaar
2016-01-26 22:17:42 +01:00
parent 3835bc2355 a770852399
commit 54a151813a
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/deploy.bat
+1 -1
View File
@@ -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.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 :: 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
pom.xml
+9 -9
View File
@@ -6,7 +6,7 @@
<groupId>org.parabot</groupId> <groupId>org.parabot</groupId>
<artifactId>client</artifactId> <artifactId>client</artifactId>
<version>2.4.3.2</version> <version>2.4.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
@@ -84,14 +84,14 @@
<resource> <resource>
<directory>deploy</directory> <directory>deploy</directory>
<filtering>true</filtering> <filtering>true</filtering>
<excludes> <!--<excludes>-->
<exclude>deploy.bat</exclude> <!--<exclude>deploy.bat</exclude>-->
<exclude>package.bat</exclude> <!--<exclude>package.bat</exclude>-->
<exclude>clean.bat</exclude> <!--<exclude>clean.bat</exclude>-->
</excludes> <!--</excludes>-->
<!--<includes>--> <includes>
<!--<include>deploy.bat</include>--> <include>deploy.bat</include>
<!--</includes>--> </includes>
</resource> </resource>
</resources> </resources>
src/main/java/org/parabot/core/asm/ASMClassLoader.java
+6 -1
View File
@@ -88,7 +88,12 @@ public class ASMClassLoader extends ClassLoader {
} }
private final ProtectionDomain getDomain() { 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()); return new ProtectionDomain(code, getPermissions());
} }
src/main/java/org/parabot/core/asm/adapters/AddSuperAdapter.java
+3 -1
View File
@@ -49,7 +49,9 @@ public class AddSuperAdapter implements Injectable {
AbstractInsnNode ain = (AbstractInsnNode) ili.next(); AbstractInsnNode ain = (AbstractInsnNode) ili.next();
if (ain.getOpcode() == Opcodes.INVOKESPECIAL) { if (ain.getOpcode() == Opcodes.INVOKESPECIAL) {
MethodInsnNode min = (MethodInsnNode) ain; MethodInsnNode min = (MethodInsnNode) ain;
min.owner = superClass; if(!min.owner.equals(node.name)) {
min.owner = superClass;
}
break; break;
} }
} }
src/main/java/org/parabot/core/parsers/servers/LocalServers.java
+2 -1
View File
@@ -87,6 +87,7 @@ public class LocalServers extends ServerParser {
} }
for (File file : Directories.listJSONFiles(Directories.getServerPath())){ for (File file : Directories.listJSONFiles(Directories.getServerPath())){
Core.verbose("[Local server in]: " + file.getName());
try { try {
JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(new FileReader(file)); JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(new FileReader(file));
String name = (String) object.get("name"); String name = (String) object.get("name");
@@ -104,9 +105,9 @@ public class LocalServers extends ServerParser {
String provider = (String) locations.get("provider"); String provider = (String) locations.get("provider");
String hooks = (String) locations.get("hooks"); String hooks = (String) locations.get("hooks");
Core.verbose("[Local server]: " + name);
ServerProviderInfo serverProviderInfo = new ServerProviderInfo(server, hooks, name, clientClass, bankTabs); ServerProviderInfo serverProviderInfo = new ServerProviderInfo(server, hooks, name, clientClass, bankTabs);
System.out.println(server);
ServerDescription desc = new ServerDescription(name, ServerDescription desc = new ServerDescription(name,
author, version); author, version);
SERVER_CACHE.put(desc, new LocalPublicServerExecuter(name, serverProviderInfo, server, provider)); SERVER_CACHE.put(desc, new LocalPublicServerExecuter(name, serverProviderInfo, server, provider));