Skip to content
This repository was archived by the owner on Jun 30, 2025. It is now read-only.

Commit 17a5439

Browse files
committed
Update
1 parent d9105ea commit 17a5439

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

build.gradle

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'java'
3+
id 'maven-publish'
34
//id "de.jjohannes.extra-java-module-info" version "0.1"
45
}
56

@@ -47,6 +48,12 @@ test {
4748
useJUnitPlatform()
4849
}
4950

51+
task sourcesJar(type: Jar) {
52+
from sourceSets.main.allJava
53+
archiveClassifier = 'sources'
54+
}
55+
56+
5057
// 删除plugins文件夹中以前构建的文件.
5158
task deleteOldBuilds(type: Delete) {
5259
for (final def f in file("${projectDir}/server/plugins/").listFiles()) {
@@ -57,10 +64,16 @@ task deleteOldBuilds(type: Delete) {
5764
}
5865
}
5966

60-
// 复制当前版本到plugins文件夹中z
67+
// 复制当前版本到plugins文件夹中
6168
task copyTask(type: Copy) {
6269
dependsOn(build)
6370
dependsOn(deleteOldBuilds)
6471
from "${buildDir}/libs/${archivesBaseName}-${version}.jar"
6572
into "${projectDir}/server/plugins/"
6673
}
74+
75+
for (final def f in file("${projectDir}/models/").listFiles()) {
76+
if (f.isFile()) {
77+
apply from: f
78+
}
79+
}

src/main/java/org/keplerproject/luajava/LuaState.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,20 +144,20 @@ public static Number convertLuaNumber(Double db, Class<?> retType) {
144144
} else if (retType == Short.TYPE) {
145145
return db.shortValue();
146146
}
147-
} else if (retType.isAssignableFrom(Number.class)) {
147+
} else if (Number.class.isAssignableFrom(retType)) {
148148
// Checks all possibilities of number types
149149
if (retType.isAssignableFrom(Integer.class)) {
150-
return db.intValue();
150+
return (Integer) db.intValue();
151151
} else if (retType.isAssignableFrom(Long.class)) {
152-
return db.longValue();
152+
return (Long) db.longValue();
153153
} else if (retType.isAssignableFrom(Float.class)) {
154-
return db.floatValue();
154+
return (Float) db.floatValue();
155155
} else if (retType.isAssignableFrom(Double.class)) {
156-
return db;
156+
return (Double) db;
157157
} else if (retType.isAssignableFrom(Byte.class)) {
158-
return db.byteValue();
158+
return (Byte) db.byteValue();
159159
} else if (retType.isAssignableFrom(Short.class)) {
160-
return db.shortValue();
160+
return (Short) db.shortValue();
161161
}
162162
}
163163

0 commit comments

Comments
 (0)