-
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes exploit where players could get duplicate top ten entries
#22 Requires 1.3.0 or later BentoBox because it listens for new events fired by that version.
- Loading branch information
1 parent
7089972
commit d4e1bbf
Showing
4 changed files
with
106 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
src/main/java/world/bentobox/level/listeners/IslandTeamListeners.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
package world.bentobox.level.listeners; | ||
|
||
import java.util.HashMap; | ||
import java.util.Map; | ||
|
||
import org.bukkit.event.EventHandler; | ||
import org.bukkit.event.EventPriority; | ||
import org.bukkit.event.Listener; | ||
|
||
import world.bentobox.bentobox.api.events.island.IslandEvent.IslandCreatedEvent; | ||
import world.bentobox.bentobox.api.events.island.IslandEvent.IslandRegisteredEvent; | ||
import world.bentobox.bentobox.api.events.island.IslandEvent.IslandResettedEvent; | ||
import world.bentobox.bentobox.api.events.island.IslandEvent.IslandUnregisteredEvent; | ||
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamJoinedEvent; | ||
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamKickEvent; | ||
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamLeaveEvent; | ||
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamSetownerEvent; | ||
import world.bentobox.bentobox.database.objects.Island; | ||
import world.bentobox.level.Level; | ||
import world.bentobox.level.calculators.CalcIslandLevel; | ||
|
||
/** | ||
* Listens for new islands or ownership changes and sets the level to zero automatically | ||
* @author tastybento | ||
* | ||
*/ | ||
public class IslandTeamListeners implements Listener { | ||
|
||
private final Level addon; | ||
private final Map<Island, CalcIslandLevel> cil; | ||
|
||
/** | ||
* @param addon - addon | ||
*/ | ||
public IslandTeamListeners(Level addon) { | ||
this.addon = addon; | ||
cil = new HashMap<>(); | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onNewIsland(IslandCreatedEvent e) { | ||
if (e.getIsland().getOwner() != null && e.getIsland().getWorld() != null) { | ||
cil.putIfAbsent(e.getIsland(), new CalcIslandLevel(addon, e.getIsland(), () -> zeroLevel(e.getIsland()))); | ||
} | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onNewIsland(IslandResettedEvent e) { | ||
if (e.getIsland().getOwner() != null && e.getIsland().getWorld() != null) { | ||
cil.putIfAbsent(e.getIsland(), new CalcIslandLevel(addon, e.getIsland(), () -> zeroLevel(e.getIsland()))); | ||
} | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onNewIslandOwner(TeamSetownerEvent e) { | ||
// Remove player from the top ten and level | ||
addon.setIslandLevel(e.getIsland().getWorld(), e.getIsland().getOwner(), 0); | ||
addon.getTopTen().removeEntry(e.getIsland().getWorld(), e.getIsland().getOwner()); | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onIsland(TeamJoinedEvent e) { | ||
// Remove player from the top ten and level | ||
addon.setIslandLevel(e.getIsland().getWorld(), e.getPlayerUUID(), 0); | ||
addon.getTopTen().removeEntry(e.getIsland().getWorld(), e.getPlayerUUID()); | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onIsland(IslandUnregisteredEvent e) { | ||
// Remove player from the top ten and level | ||
addon.setIslandLevel(e.getIsland().getWorld(), e.getPlayerUUID(), 0); | ||
addon.getTopTen().removeEntry(e.getIsland().getWorld(), e.getPlayerUUID()); | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onIsland(IslandRegisteredEvent e) { | ||
// Remove player from the top ten and level | ||
addon.setIslandLevel(e.getIsland().getWorld(), e.getPlayerUUID(), 0); | ||
addon.getTopTen().removeEntry(e.getIsland().getWorld(), e.getPlayerUUID()); | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onIsland(TeamLeaveEvent e) { | ||
// Remove player from the top ten and level | ||
addon.setIslandLevel(e.getIsland().getWorld(), e.getPlayerUUID(), 0); | ||
addon.getTopTen().removeEntry(e.getIsland().getWorld(), e.getPlayerUUID()); | ||
} | ||
|
||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) | ||
public void onIsland(TeamKickEvent e) { | ||
// Remove player from the top ten and level | ||
addon.setIslandLevel(e.getIsland().getWorld(), e.getPlayerUUID(), 0); | ||
addon.getTopTen().removeEntry(e.getIsland().getWorld(), e.getPlayerUUID()); | ||
} | ||
|
||
private void zeroLevel(Island island) { | ||
if (cil.containsKey(island)) { | ||
addon.setInitialIslandLevel(island, cil.get(island).getResult().getLevel()); | ||
cil.remove(island); | ||
} | ||
} | ||
} |
54 changes: 0 additions & 54 deletions
54
src/main/java/world/bentobox/level/listeners/NewIslandListener.java
This file was deleted.
Oops, something went wrong.