Upstream/Boxed
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Boxed.git synced 2024-09-27 04:02:34 +02:00
Code Issues Projects Releases Wiki Activity

Exploit fix. Coops could gift advancements to others.

Browse Source 
Fixes https://github.com/BentoBoxWorld/Boxed/issues/18
This commit is contained in:
tastybento 2021-04-09 22:24:52 -07:00
parent 81b599e70a
commit d997b391a9
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/world/bentobox/boxed/AdvancementsManager.java
View File

@ -16,6 +16,7 @@ import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.api.events.island.IslandEvent;
import world.bentobox.bentobox.database.Database;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.managers.RanksManager;
import world.bentobox.bentobox.util.Util;
import world.bentobox.boxed.objects.IslandAdvancements;
@ -166,7 +167,9 @@ public class AdvancementsManager {
}
// Get island
Island island = addon.getIslands().getIsland(addon.getOverWorld(), p.getUniqueId());
if (island != null && addAdvancement(island, advancement.getKey().toString())) {
if (island != null
&& island.getRank(p.getUniqueId()) > RanksManager.MEMBER_RANK // Only island members expand island
&& addAdvancement(island, advancement.getKey().toString())) {
int oldSize = island.getProtectionRange();
int newSize = Math.max(1, oldSize + score);
island.setProtectionRange(newSize);

28
src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java
View File

@ -71,6 +71,16 @@ public class AdvancementListener implements Listener {
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onAdvancement(PlayerAdvancementDoneEvent e) {
if (Util.sameWorld(e.getPlayer().getWorld(), addon.getOverWorld())) {
// Only allow members or higher to get advancements in a box
if (!addon.getIslands().getIslandAt(e.getPlayer().getLocation()).map(i -> i.getMemberSet().contains(e.getPlayer().getUniqueId())).orElse(false)) {
// Remove advancement from player
e.getAdvancement().getCriteria().forEach(c ->
e.getPlayer().getAdvancementProgress(e.getAdvancement()).revokeCriteria(c));
User u = User.getInstance(e.getPlayer());
u.notify("boxed.adv-disallowed", TextVariables.NAME, e.getPlayer().getName(), TextVariables.DESCRIPTION, this.keyToString(u, e.getAdvancement().getKey()));
return;
}
int score = addon.getAdvManager().addAdvancement(e.getPlayer(), e.getAdvancement());
if (score != 0) {
User user = User.getInstance(e.getPlayer());
@ -81,7 +91,7 @@ public class AdvancementListener implements Listener {
private void tellTeam(User user, NamespacedKey key, int score) {
Island island = addon.getIslands().getIsland(addon.getOverWorld(), user);
island.getMemberSet(RanksManager.COOP_RANK).stream()
island.getMemberSet(RanksManager.MEMBER_RANK).stream()
.map(User::getInstance)
.filter(User::isOnline)
.forEach(u -> {
@ -96,7 +106,7 @@ public class AdvancementListener implements Listener {
.forEach(u -> u.sendMessage("boxed.user-completed", TextVariables.NAME, user.getName(), TextVariables.DESCRIPTION, this.keyToString(u, key)));
}
}
/**
* Synchronize the player's advancements to that of the island.
* Player's advancements should be cleared before calling this othewise they will get add the island ones as well.
@ -171,10 +181,10 @@ public class AdvancementListener implements Listener {
if (addon.getSettings().isOnJoinResetAdvancements() && user.isOnline()
&& addon.getOverWorld().equals(Util.getWorld(user.getWorld()))) {
// Clear and set advancements
clearAndSetAdv(user, addon.getSettings().isOnJoinResetAdvancements(), addon.getSettings().getOnJoinGrantAdvancements());
clearAndSetAdv(user, addon.getSettings().isOnJoinResetAdvancements(), addon.getSettings().getOnJoinGrantAdvancements());
// Set advancements to same as island
syncAdvancements(user);
}
}
}
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
@ -194,7 +204,7 @@ public class AdvancementListener implements Listener {
}
private void clearAndSetAdv(User user, boolean clear, List<String> list) {
private void clearAndSetAdv(User user, boolean clear, List<String> list) {
if (!user.isOnline()) {
return;
}
@ -214,10 +224,10 @@ public class AdvancementListener implements Listener {
private void grantAdv(User user, List<String> list) {
Iterator<Advancement> it = Bukkit.advancementIterator();
while (it.hasNext()) {
Advancement a = it.next();
Advancement a = it.next();
AdvancementProgress progress = user.getPlayer().getAdvancementProgress(a);
if (list.contains(a.getKey().toString()) && !progress.isDone()) {
// Award
// Award
a.getCriteria().forEach(progress::awardCriteria);
}
}
@ -232,7 +242,7 @@ public class AdvancementListener implements Listener {
case BLOCK:
for (Material m: Material.values()) {
if (m.isBlock() && !m.isLegacy()) {
user.getPlayer().setStatistic(s, m, 0);
user.getPlayer().setStatistic(s, m, 0);
}
}
break;
@ -267,6 +277,6 @@ public class AdvancementListener implements Listener {
p.getAwardedCriteria().forEach(p::revokeCriteria);
}
}
}
}

1
src/main/resources/locales/en-US.yml
View File

@ -5,6 +5,7 @@ boxed:
completed: '&a [name] completed!'
size-changed: '&a Box size increased by [number]!'
user-completed: '&a [name] completed [description]!'
adv-disallowed: "&c You can only complete advancements in your own box. Revoking [description]."
general:
errors:
no-island: '&c You do not have a box!'