EpicKnarvik97/BlockHunt
EpicKnarvik97/BlockHunt
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Revert breaking changes and files that should be ignored

Browse Source
This commit is contained in:
Narimm 2018-03-03 12:46:00 +10:00
parent ed36764386
commit af72f0d829
4 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.classpath
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="lib/LibsDisguises.jar"/>
<classpathentry kind="lib" path="lib/ProtocolLib.jar"/>
<classpathentry kind="lib" path="lib/spigot-1.9.2-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

17
.project
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>BlockHunt</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

2
src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java
View File

@ -76,7 +76,7 @@ public class OnEntityDamageByEntityEvent implements Listener {
} else { } else {
// Seeker damaged by hider // Seeker damaged by hider
if (!arena.hidersCanHurtSeekers) { if (!arena.hidersCanHurtSeekers) {
event.setCancelled(false); event.setCancelled(true);
return; return;
} }
} }

12
src/nl/Steffion/BlockHunt/Listeners/OnPlayerQuitEvent.java
View File

@ -15,17 +15,12 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
public class OnPlayerQuitEvent implements Listener { public class OnPlayerQuitEvent implements Listener {
public ArrayList<String> leftPlayer = new ArrayList<String>();
public LocationSerializable spawnWarp;
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerQuitEvent(PlayerQuitEvent event) { public void onPlayerQuitEvent(PlayerQuitEvent event) {
Player playerLeaving = event.getPlayer(); Player playerLeaving = event.getPlayer();
for (Arena arena : W.arenaList) { for (Arena arena : W.arenaList) {
if (arena.playersInArena.contains(playerLeaving)) { if (arena.playersInArena.contains(playerLeaving)) {
spawnWarp = arena.spawnWarp;
leftPlayer.add(playerLeaving.getUniqueId().toString());
ArenaHandler.playerLeaveArena(playerLeaving, true, true); ArenaHandler.playerLeaveArena(playerLeaving, true, true);
} }
} }
@ -34,9 +29,6 @@ public class OnPlayerQuitEvent implements Listener {
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerJoinEvent(PlayerJoinEvent event) { public void onPlayerJoinEvent(PlayerJoinEvent event) {
Player playerJoining = event.getPlayer(); Player playerJoining = event.getPlayer();
if(leftPlayer.contains(playerJoining.getUniqueId().toString())) { playerJoining.teleport(playerJoining.getWorld().getSpawnLocation());
playerJoining.teleport(spawnWarp);
leftPlayer.remove(playerJoining.getUniqueId().toString());
}
} }
} }