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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ public class OnEntityDamageByEntityEvent implements Listener {
} else {
// Seeker damaged by hider
if (!arena.hidersCanHurtSeekers) {
event.setCancelled(false);
event.setCancelled(true);
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;
public class OnPlayerQuitEvent implements Listener {
public ArrayList<String> leftPlayer = new ArrayList<String>();
public LocationSerializable spawnWarp;
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerQuitEvent(PlayerQuitEvent event) {
Player playerLeaving = event.getPlayer();
for (Arena arena : W.arenaList) {
if (arena.playersInArena.contains(playerLeaving)) {
spawnWarp = arena.spawnWarp;
leftPlayer.add(playerLeaving.getUniqueId().toString());
ArenaHandler.playerLeaveArena(playerLeaving, true, true);
}
}
@ -34,9 +29,6 @@ public class OnPlayerQuitEvent implements Listener {
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerJoinEvent(PlayerJoinEvent event) {
Player playerJoining = event.getPlayer();
if(leftPlayer.contains(playerJoining.getUniqueId().toString())) {
playerJoining.teleport(spawnWarp);
leftPlayer.remove(playerJoining.getUniqueId().toString());
}
playerJoining.teleport(playerJoining.getWorld().getSpawnLocation());
}
}