Update to latest version
This commit is contained in:
1 parent
16d554bbf7
commit
6a99e651b7
4 files changed
+54
-15
No files matched your search
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE xml>
|
||||
<project name="hideandseek" default="Build">
|
||||
<xmlproperty file="pom.xml" prefix="pom" keeproot="false"/>
|
||||
<target name="Build">
|
||||
<jar jarfile="C:\Users\alex\Downloads\HS Test\plugins\${ant.project.name}.jar" basedir="./target/classes/" includes="**/*">
|
||||
</jar>
|
||||
</target>
|
||||
</project>
|
||||
@@ -1,4 +1,6 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"><modelVersion>4.0.0</modelVersion>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>dev.tylerm</groupId>
|
||||
<artifactId>KenshinsHideAndSeek</artifactId>
|
||||
<version>1.8.2</version>
|
||||
@@ -61,7 +63,8 @@
|
||||
</filter>
|
||||
</filters>
|
||||
<transformers>
|
||||
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
<resource>META-INF/services/java.sql.Driver</resource>
|
||||
</transformer>
|
||||
</transformers>
|
||||
@@ -96,6 +99,7 @@
|
||||
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
@@ -129,7 +133,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.cryptomorin</groupId>
|
||||
<artifactId>XSeries</artifactId>
|
||||
<version>11.3.0</version>
|
||||
<version>13.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.clip</groupId>
|
||||
|
||||
@@ -4,22 +4,23 @@ import dev.tylerm.khs.command.*;
|
||||
import dev.tylerm.khs.command.map.Debug;
|
||||
import dev.tylerm.khs.command.map.GoTo;
|
||||
import dev.tylerm.khs.command.map.Save;
|
||||
import dev.tylerm.khs.command.map.blockhunt.Enabled;
|
||||
import dev.tylerm.khs.command.map.blockhunt.blocks.Add;
|
||||
import dev.tylerm.khs.command.map.blockhunt.blocks.List;
|
||||
import dev.tylerm.khs.command.map.blockhunt.blocks.Remove;
|
||||
import dev.tylerm.khs.command.map.set.*;
|
||||
import dev.tylerm.khs.command.util.CommandGroup;
|
||||
import dev.tylerm.khs.command.world.Create;
|
||||
import dev.tylerm.khs.command.world.Delete;
|
||||
import dev.tylerm.khs.command.world.Tp;
|
||||
import dev.tylerm.khs.configuration.*;
|
||||
import dev.tylerm.khs.database.Database;
|
||||
import dev.tylerm.khs.game.*;
|
||||
import dev.tylerm.khs.game.events.AntiFire;
|
||||
import dev.tylerm.khs.game.events.Blockchange;
|
||||
import dev.tylerm.khs.game.listener.*;
|
||||
import dev.tylerm.khs.game.util.Status;
|
||||
import dev.tylerm.khs.util.PAPIExpansion;
|
||||
import dev.tylerm.khs.command.map.blockhunt.Enabled;
|
||||
import dev.tylerm.khs.command.world.Create;
|
||||
import dev.tylerm.khs.command.world.Delete;
|
||||
import dev.tylerm.khs.command.world.Tp;
|
||||
import dev.tylerm.khs.database.Database;
|
||||
import dev.tylerm.khs.command.util.CommandGroup;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@@ -34,7 +35,8 @@ import java.util.Arrays;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import static dev.tylerm.khs.configuration.Config.*;
|
||||
import static dev.tylerm.khs.configuration.Config.errorPrefix;
|
||||
import static dev.tylerm.khs.configuration.Config.exitPosition;
|
||||
import static dev.tylerm.khs.configuration.Localization.message;
|
||||
|
||||
public class Main extends JavaPlugin implements Listener {
|
||||
@@ -59,7 +61,8 @@ public class Main extends JavaPlugin implements Listener {
|
||||
Main.instance = this;
|
||||
|
||||
getLogger().info("Getting minecraft version...");
|
||||
this.updateVersion();;
|
||||
this.updateVersion();
|
||||
;
|
||||
|
||||
try {
|
||||
getLogger().info("Loading config.yml...");
|
||||
@@ -198,6 +201,7 @@ public class Main extends JavaPlugin implements Listener {
|
||||
getServer().getPluginManager().registerEvents(new RespawnHandler(), this);
|
||||
getServer().getPluginManager().registerEvents(new WorldInteractHandler(), this);
|
||||
getServer().getPluginManager().registerEvents(new Blockchange(), this);
|
||||
getServer().getPluginManager().registerEvents(new AntiFire(), this);
|
||||
}
|
||||
|
||||
private void updateVersion() {
|
||||
@@ -262,11 +266,17 @@ public class Main extends JavaPlugin implements Listener {
|
||||
return game;
|
||||
}
|
||||
|
||||
public Disguiser getDisguiser() { return disguiser; }
|
||||
public Disguiser getDisguiser() {
|
||||
return disguiser;
|
||||
}
|
||||
|
||||
public EntityHider getEntityHider() { return entityHider; }
|
||||
public EntityHider getEntityHider() {
|
||||
return entityHider;
|
||||
}
|
||||
|
||||
public CommandGroup getCommandGroup() { return commandGroup; }
|
||||
public CommandGroup getCommandGroup() {
|
||||
return commandGroup;
|
||||
}
|
||||
|
||||
public boolean supports(int v) {
|
||||
return version >= v;
|
||||
@@ -284,7 +294,8 @@ public class Main extends JavaPlugin implements Listener {
|
||||
if (!file.isDirectory()) return;
|
||||
String[] files = file.list();
|
||||
if (files == null) return;
|
||||
if (!Arrays.asList(files).contains("session.lock") && !Arrays.asList(files).contains("level.dat")) return;
|
||||
if (!Arrays.asList(files).contains("session.lock") && !Arrays.asList(files).contains("level.dat"))
|
||||
return;
|
||||
worlds.add(file.getName());
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package dev.tylerm.khs.game.events;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityCombustEvent;
|
||||
|
||||
public class AntiFire implements Listener {
|
||||
@EventHandler
|
||||
public void onPlayerFireTick(EntityCombustEvent event) {
|
||||
if (event.getEntity() instanceof Player) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user