Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-22 08:12:13 +01:00
Code Issues Projects Releases Wiki Activity

Bump version number

Browse Source
This commit is contained in:
BuildTools 2019-03-12 02:51:55 -04:00
parent c83e01df38
commit 2a8413ef68
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/pom.xml vendored
View File

@ -5,7 +5,7 @@
<parent>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-parent</artifactId>
<version>3.6.4</version>
<version>${revision}</version>
</parent>
<artifactId>quests-dist</artifactId>
<packaging>pom</packaging>
@ -43,22 +43,22 @@
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-main</artifactId>
<version>${project.parent.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-v1_8_R3</artifactId>
<version>${project.parent.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-v1_8_R2</artifactId>
<version>${project.parent.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-v1_8_R1</artifactId>
<version>${project.parent.version}</version>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

2
main/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-parent</artifactId>
<version>3.6.4</version>
<version>${revision}</version>
</parent>
<artifactId>quests-main</artifactId>

12
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -1377,13 +1377,13 @@ public class Quester {
}
public void interactWithNPC(Quest quest, NPC n) {
if (getQuestData(quest).citizensInteracted.containsKey(n.getId())) {
Boolean b = getQuestData(quest).citizensInteracted.get(n.getId());
if (b != null && !b) {
getQuestData(quest).citizensInteracted.put(n.getId(), true);
finishObjective(quest, "talkToNPC", null, null, null, null, null, n, null, null, null, null);
}
if (getQuestData(quest).citizensInteracted.containsKey(n.getId())) {
Boolean b = getQuestData(quest).citizensInteracted.get(n.getId());
if (b != null && !b) {
getQuestData(quest).citizensInteracted.put(n.getId(), true);
finishObjective(quest, "talkToNPC", null, null, null, null, null, n, null, null, null, null);
}
}
}
public void killNPC(Quest quest, NPC n) {

23
main/src/main/java/me/blackvein/quests/util/LocaleQuery.java
View File

@ -17,7 +17,6 @@ import java.lang.reflect.Method;
import java.util.LinkedHashMap;
import java.util.Map;
import me.blackvein.quests.Quester;
import me.blackvein.quests.Quests;
import org.bukkit.Bukkit;
@ -49,6 +48,17 @@ public class LocaleQuery {
setup();
}
public void setup() {
String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
try {
craftMagicNumbers = Class.forName("org.bukkit.craftbukkit.{v}.util.CraftMagicNumbers".replace("{v}", version));
itemClazz = Class.forName("net.minecraft.server.{v}.Item".replace("{v}", version));
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
}
public void setBukkitVersion(String bukkitVersion) {
oldVersion = isBelow113(bukkitVersion);
for (Material test : Material.values()) {
@ -197,17 +207,6 @@ public class LocaleQuery {
return null;
}
public void setup() {
String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
try {
craftMagicNumbers = Class.forName("org.bukkit.craftbukkit.{v}.util.CraftMagicNumbers".replace("{v}", version));
itemClazz = Class.forName("net.minecraft.server.{v}.Item".replace("{v}", version));
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
}
public static boolean isBelow113(String bukkitVersion) {
return _isBelow113(bukkitVersion);
}

3
pom.xml
View File

@ -6,11 +6,12 @@
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-parent</artifactId>
<version>3.6.4</version>
<version>${revision}</version>
<name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url>
<properties>
<revision>3.6.5</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

4
v1_8_R1/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-parent</artifactId>
<version>3.6.4</version>
<version>${revision}</version>
</parent>
<properties>
@ -22,7 +22,7 @@
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-main</artifactId>
<version>${project.parent.version}</version>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
v1_8_R2/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-parent</artifactId>
<version>3.6.4</version>
<version>${revision}</version>
</parent>
<properties>
@ -22,7 +22,7 @@
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-main</artifactId>
<version>${project.parent.version}</version>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
v1_8_R3/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-parent</artifactId>
<version>3.6.4</version>
<version>${revision}</version>
</parent>
<properties>
@ -22,7 +22,7 @@
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-main</artifactId>
<version>${project.parent.version}</version>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
</dependencies>