From ce0a916f52140ed7e8fd31910e88cf63a97fa4e6 Mon Sep 17 00:00:00 2001 From: joshi1999 Date: Sun, 10 Dec 2023 13:30:53 +0100 Subject: [PATCH 1/4] Adding recorder deactivation option --- .../com/mineauz/minigames/minigame/Minigame.java | 11 +++++++++++ .../mineauz/minigames/recorder/RecorderData.java | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java b/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java index 66a2fe2b3..62421bab9 100644 --- a/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java +++ b/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java @@ -120,6 +120,7 @@ public class Minigame implements ScriptObject { @NotNull private final ScoreboardData sbData = new ScoreboardData(); private final Map statSettings = Maps.newHashMap(); + private final BooleanFlag activateBlockRecorder = new BooleanFlag(true, "activateBlockRecorder"); //Unsaved data private final List players = new ArrayList<>(); @@ -180,6 +181,7 @@ private void setup(MinigameType type, Location start) { flags.setFlag(new ArrayList<>()); + addConfigFlag(activateBlockRecorder); addConfigFlag(allowEnderPearls); addConfigFlag(allowFlight); addConfigFlag(allowMPCheckpoints); @@ -898,6 +900,14 @@ public void setMaxChestRandom(int maxChestRandom) { this.maxChestRandom.setFlag(maxChestRandom); } + public boolean getActivateBlockRecorder() { + return activateBlockRecorder.getFlag(); + } + + public void setActivateBlockRecorder(boolean activateBlockRecorder) { + this.activateBlockRecorder.setFlag(activateBlockRecorder); + } + public Collection getRegenRegions() { return regenRegions.getFlag().values(); } @@ -1238,6 +1248,7 @@ public void setValue(Integer value) { rndChstDes.add("Max. item randomization"); itemsMain.add(maxChestRandom.getMenuItem("Max. Chest Random", Material.STONE, rndChstDes, 0, null)); itemsMain.add(new MenuItemStatisticsSettings(this, "Stat Settings", Material.WRITABLE_BOOK)); + itemsMain.add(activateBlockRecorder.getMenuItem("Activate Block Recorder", Material.COMMAND_BLOCK)); itemsMain.add(new MenuItemNewLine()); //--------------// diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java index a5ab18cd5..a962046b0 100644 --- a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java +++ b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java @@ -31,9 +31,6 @@ import java.lang.reflect.Type; import java.util.*; -/** - * - */ public class RecorderData implements Listener { // list of blocks that need another block to not break private static final ArrayList supportedMats = new ArrayList<>(); @@ -150,11 +147,17 @@ public Minigame getMinigame() { } public MgBlockData addBlock(@NotNull Block block, @Nullable MinigamePlayer modifier) { + if (!minigame.getActivateBlockRecorder()) { + return new MgBlockData(block, modifier); + } BlockStateSnapshotResult blockState = PaperLib.getBlockState(block, true); return addBlock(blockState.getState(), modifier); } public MgBlockData addBlock(@NotNull BlockState block, @Nullable MinigamePlayer modifier) { + if (!minigame.getActivateBlockRecorder()) { + return new MgBlockData(block, modifier); + } MgBlockData bdata = new MgBlockData(block, modifier); Position pos = Position.block(block.getLocation()); @@ -200,6 +203,9 @@ public MgBlockData addBlock(@NotNull BlockState block, @Nullable MinigamePlayer } public void addInventory(MgBlockData bdata, InventoryHolder ih) { + if (!minigame.getActivateBlockRecorder()) { + return; + } ItemStack[] inventory = Arrays.stream(ih.getInventory().getContents()). map(itemStack -> itemStack == null ? null : itemStack.clone()).toArray(ItemStack[]::new); @@ -208,6 +214,9 @@ public void addInventory(MgBlockData bdata, InventoryHolder ih) { //add an entity to get reset public void addEntity(@NotNull Entity ent, @Nullable MinigamePlayer player, boolean created) { + if (!minigame.getActivateBlockRecorder()) { + return; + } EntityData oldData = entityData.get(ent.getUniqueId()); if (oldData != null) { if (oldData.wasCreated() && !created) { From 9e70022ce9beffe69509a15ebd924ecf3e6b406d Mon Sep 17 00:00:00 2001 From: joshi1999 Date: Mon, 11 Dec 2023 21:15:46 +0100 Subject: [PATCH 2/4] Missing team match block color identifiers --- .../minigamesregions/conditions/MatchTeamCondition.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MatchTeamCondition.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MatchTeamCondition.java index 44d723e82..e6641a06d 100644 --- a/Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MatchTeamCondition.java +++ b/Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MatchTeamCondition.java @@ -112,7 +112,11 @@ private Material getTeamMaterial() { case "DARK_BLUE" -> Material.BLUE_CONCRETE; case "DARK_GREEN" -> Material.GREEN_CONCRETE; case "DARK_PURPLE" -> Material.PURPLE_CONCRETE; + case "DARK_GRAY" -> Material.GRAY_CONCRETE; case "GRAY" -> Material.GRAY_WOOL; + case "ORANGE" -> Material.ORANGE_WOOL; + case "CYAN" -> Material.CYAN_WOOL; + case "LIGHT_BLUE" -> Material.LIGHT_BLUE_WOOL; default -> Material.WHITE_WOOL; }; } From 5af69cd5f4f056c0d2d7af79d7bbe2318b133d55 Mon Sep 17 00:00:00 2001 From: joshi1999 Date: Sat, 24 Feb 2024 12:50:49 +0100 Subject: [PATCH 3/4] Reimplement recorder deactivation RegenRecorder etc. are working now just fine --- .../mineauz/minigames/minigame/Minigame.java | 2 +- .../minigames/recorder/BasicRecorder.java | 43 +++++++++++-------- .../minigames/recorder/RecorderData.java | 12 ------ 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java b/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java index 62421bab9..98d6a49b1 100644 --- a/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java +++ b/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java @@ -1248,7 +1248,7 @@ public void setValue(Integer value) { rndChstDes.add("Max. item randomization"); itemsMain.add(maxChestRandom.getMenuItem("Max. Chest Random", Material.STONE, rndChstDes, 0, null)); itemsMain.add(new MenuItemStatisticsSettings(this, "Stat Settings", Material.WRITABLE_BOOK)); - itemsMain.add(activateBlockRecorder.getMenuItem("Activate Block Recorder", Material.COMMAND_BLOCK)); + itemsMain.add(activateBlockRecorder.getMenuItem("Activate Player Block Recorder", Material.COMMAND_BLOCK)); itemsMain.add(new MenuItemNewLine()); //--------------// diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java index c81c3a703..d2e350173 100644 --- a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java +++ b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java @@ -68,8 +68,11 @@ private boolean handleBlockBreak(BlockBreakEvent event, MinigamePlayer mgPlayer) } } + if (mgm.getActivateBlockRecorder()) { + recData.addBlock(event.getBlock(), mgPlayer); + } + // signs are safe. Now check for block drops - recData.addBlock(event.getBlock(), mgPlayer); if (!mgm.canBlocksdrop()) { event.getBlock().setType(Material.AIR); return true; @@ -140,14 +143,16 @@ private void blockPlace(BlockPlaceEvent event) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be placed if (recData.getWBBlocks().contains(event.getBlock().getType())) { - recData.addBlock(event.getBlockReplacedState(), mgPlayer); + if (mgm.getActivateBlockRecorder()) { + recData.addBlock(event.getBlockReplacedState(), mgPlayer); + } } else { event.setCancelled(true); } //black list --> blocks that are not allowed to be placed } else if (recData.getWBBlocks().contains(event.getBlock().getType())) { event.setCancelled(true); - } else { + } else if (mgm.getActivateBlockRecorder()) { recData.addBlock(event.getBlockReplacedState(), mgPlayer); } } else { @@ -169,7 +174,7 @@ private void changeAnotherInventory(PlayerInteractEvent event) { Minigame mgm = mgPlayer.getMinigame(); RecorderData recData = mgm.getRecorderData(); - if (event.getClickedBlock().getState() instanceof InventoryHolder) { + if (event.getClickedBlock().getState() instanceof InventoryHolder && mgm.getActivateBlockRecorder()) { recData.addBlock(event.getClickedBlock().getLocation().getBlock(), mgPlayer); } } @@ -191,11 +196,13 @@ public void igniteBlock(BlockIgniteEvent event) { if (mgm.canBlockPlace()) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken - if (recData.getWBBlocks().contains(event.getBlock().getType())) { + if (recData.getWBBlocks().contains(event.getBlock().getType()) + && mgm.getActivateBlockRecorder()) { recData.addBlock(event.getBlock(), playerManager.getMinigamePlayer(event.getPlayer())); } //black list --> blocks that are not allowed to be broken - } else if (!recData.getWBBlocks().contains(event.getBlock().getType())) { + } else if (!recData.getWBBlocks().contains(event.getBlock().getType()) + && mgm.getActivateBlockRecorder()) { recData.addBlock(event.getBlock(), playerManager.getMinigamePlayer(event.getPlayer())); } } else { @@ -231,12 +238,12 @@ private void hangingPlace(HangingPlaceEvent event) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken - if (recData.getWBBlocks().contains(usedMaterial)) { + if (recData.getWBBlocks().contains(usedMaterial) && mgm.getActivateBlockRecorder()) { recData.addEntity(event.getEntity(), mgPlayer, true); return; } //black list --> blocks that are not allowed to be broken - } else if (!recData.getWBBlocks().contains(usedMaterial)) { + } else if (!recData.getWBBlocks().contains(usedMaterial) && mgm.getActivateBlockRecorder()) { recData.addEntity(event.getEntity(), mgPlayer, true); return; } @@ -266,7 +273,7 @@ private void animalHurt(EntityDamageByEntityEvent event) { } if (mgPlayer != null) { - if (mgPlayer.isInMinigame()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(animal, mgPlayer, false); } } @@ -289,7 +296,7 @@ private void hangingBreak(HangingBreakByEntityEvent event) { } if (mgPlayer != null) { - if (mgPlayer.isInMinigame()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(event.getEntity(), mgPlayer, false); } } @@ -303,7 +310,7 @@ private void arrowShoot(EntityShootBowEvent event) { if (event.getEntity() instanceof Player player) { MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player); - if (mgPlayer.isInMinigame()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(event.getProjectile(), mgPlayer, true); } } @@ -317,7 +324,7 @@ private void throwEnderPearl(ProjectileLaunchEvent event) { if (event.getEntity().getShooter() instanceof Player player) { MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player); - if (mgPlayer.isInMinigame()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(event.getEntity(), mgPlayer, true); } } @@ -337,11 +344,12 @@ private void bucketFill(PlayerBucketFillEvent event) { if (mgm.canBlockBreak()) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken - if (recData.getWBBlocks().contains(event.getBlock().getType())) { + if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivateBlockRecorder()) { recData.addBlock(event.getBlockClicked(), playerManager.getMinigamePlayer(event.getPlayer())); } //black list --> blocks that are not allowed to be broken - } else if (!recData.getWBBlocks().contains(event.getBlock().getType())) { + } else if (!recData.getWBBlocks().contains(event.getBlock().getType()) + && mgm.getActivateBlockRecorder()) { recData.addBlock(event.getBlockClicked(), playerManager.getMinigamePlayer(event.getPlayer())); } } else { @@ -364,7 +372,7 @@ private void bucketEmpty(PlayerBucketEmptyEvent event) { if (mgm.canBlockPlace()) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken - if (recData.getWBBlocks().contains(event.getBlock().getType())) { + if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivateBlockRecorder()) { Location loc = new Location(event.getBlockClicked().getWorld(), event.getBlockFace().getModX() + event.getBlockClicked().getX(), event.getBlockFace().getModY() + event.getBlockClicked().getY(), @@ -372,7 +380,8 @@ private void bucketEmpty(PlayerBucketEmptyEvent event) { recData.addBlock(loc.getBlock(), playerManager.getMinigamePlayer(event.getPlayer())); } //black list --> blocks that are not allowed to be broken - } else if (!recData.getWBBlocks().contains(event.getBlock().getType())) { + } else if (!recData.getWBBlocks().contains(event.getBlock().getType()) + && mgm.getActivateBlockRecorder()) { Location loc = new Location(event.getBlockClicked().getWorld(), event.getBlockFace().getModX() + event.getBlockClicked().getX(), event.getBlockFace().getModY() + event.getBlockClicked().getY(), @@ -395,7 +404,7 @@ private void vehicleDestroy(VehicleDestroyEvent event) { MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player); Minigame mg = mgPlayer.getMinigame(); - if (mgPlayer.isInMinigame()) { + if (mgPlayer.isInMinigame() && mg.getActivateBlockRecorder()) { mg.getRecorderData().addEntity(event.getVehicle(), mgPlayer, false); } } diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java index a962046b0..a19259593 100644 --- a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java +++ b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java @@ -147,17 +147,11 @@ public Minigame getMinigame() { } public MgBlockData addBlock(@NotNull Block block, @Nullable MinigamePlayer modifier) { - if (!minigame.getActivateBlockRecorder()) { - return new MgBlockData(block, modifier); - } BlockStateSnapshotResult blockState = PaperLib.getBlockState(block, true); return addBlock(blockState.getState(), modifier); } public MgBlockData addBlock(@NotNull BlockState block, @Nullable MinigamePlayer modifier) { - if (!minigame.getActivateBlockRecorder()) { - return new MgBlockData(block, modifier); - } MgBlockData bdata = new MgBlockData(block, modifier); Position pos = Position.block(block.getLocation()); @@ -203,9 +197,6 @@ public MgBlockData addBlock(@NotNull BlockState block, @Nullable MinigamePlayer } public void addInventory(MgBlockData bdata, InventoryHolder ih) { - if (!minigame.getActivateBlockRecorder()) { - return; - } ItemStack[] inventory = Arrays.stream(ih.getInventory().getContents()). map(itemStack -> itemStack == null ? null : itemStack.clone()).toArray(ItemStack[]::new); @@ -214,9 +205,6 @@ public void addInventory(MgBlockData bdata, InventoryHolder ih) { //add an entity to get reset public void addEntity(@NotNull Entity ent, @Nullable MinigamePlayer player, boolean created) { - if (!minigame.getActivateBlockRecorder()) { - return; - } EntityData oldData = entityData.get(ent.getUniqueId()); if (oldData != null) { if (oldData.wasCreated() && !created) { From 3422c0f886c84c51287f4fd9c6af454c97a0e5e7 Mon Sep 17 00:00:00 2001 From: joshi1999 Date: Sun, 25 Feb 2024 12:07:49 +0100 Subject: [PATCH 4/4] Rename ActivateBlockRecorder option to ActivatePlayerRecorder --- .../mineauz/minigames/minigame/Minigame.java | 14 ++++---- .../minigames/recorder/BasicRecorder.java | 34 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java b/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java index 98d6a49b1..fe580feea 100644 --- a/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java +++ b/Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java @@ -120,7 +120,7 @@ public class Minigame implements ScriptObject { @NotNull private final ScoreboardData sbData = new ScoreboardData(); private final Map statSettings = Maps.newHashMap(); - private final BooleanFlag activateBlockRecorder = new BooleanFlag(true, "activateBlockRecorder"); + private final BooleanFlag activatePlayerRecorder = new BooleanFlag(true, "activatePlayerRecorder"); //Unsaved data private final List players = new ArrayList<>(); @@ -181,7 +181,7 @@ private void setup(MinigameType type, Location start) { flags.setFlag(new ArrayList<>()); - addConfigFlag(activateBlockRecorder); + addConfigFlag(activatePlayerRecorder); addConfigFlag(allowEnderPearls); addConfigFlag(allowFlight); addConfigFlag(allowMPCheckpoints); @@ -900,12 +900,12 @@ public void setMaxChestRandom(int maxChestRandom) { this.maxChestRandom.setFlag(maxChestRandom); } - public boolean getActivateBlockRecorder() { - return activateBlockRecorder.getFlag(); + public boolean getActivatePlayerRecorder() { + return activatePlayerRecorder.getFlag(); } - public void setActivateBlockRecorder(boolean activateBlockRecorder) { - this.activateBlockRecorder.setFlag(activateBlockRecorder); + public void setActivatePlayerRecorder(boolean activatePlayerRecorder) { + this.activatePlayerRecorder.setFlag(activatePlayerRecorder); } public Collection getRegenRegions() { @@ -1248,7 +1248,7 @@ public void setValue(Integer value) { rndChstDes.add("Max. item randomization"); itemsMain.add(maxChestRandom.getMenuItem("Max. Chest Random", Material.STONE, rndChstDes, 0, null)); itemsMain.add(new MenuItemStatisticsSettings(this, "Stat Settings", Material.WRITABLE_BOOK)); - itemsMain.add(activateBlockRecorder.getMenuItem("Activate Player Block Recorder", Material.COMMAND_BLOCK)); + itemsMain.add(activatePlayerRecorder.getMenuItem("Activate Player Block Recorder", Material.COMMAND_BLOCK)); itemsMain.add(new MenuItemNewLine()); //--------------// diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java index d2e350173..95360e73a 100644 --- a/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java +++ b/Minigames/src/main/java/au/com/mineauz/minigames/recorder/BasicRecorder.java @@ -68,7 +68,7 @@ private boolean handleBlockBreak(BlockBreakEvent event, MinigamePlayer mgPlayer) } } - if (mgm.getActivateBlockRecorder()) { + if (mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getBlock(), mgPlayer); } @@ -143,7 +143,7 @@ private void blockPlace(BlockPlaceEvent event) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be placed if (recData.getWBBlocks().contains(event.getBlock().getType())) { - if (mgm.getActivateBlockRecorder()) { + if (mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getBlockReplacedState(), mgPlayer); } } else { @@ -152,7 +152,7 @@ private void blockPlace(BlockPlaceEvent event) { //black list --> blocks that are not allowed to be placed } else if (recData.getWBBlocks().contains(event.getBlock().getType())) { event.setCancelled(true); - } else if (mgm.getActivateBlockRecorder()) { + } else if (mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getBlockReplacedState(), mgPlayer); } } else { @@ -174,7 +174,7 @@ private void changeAnotherInventory(PlayerInteractEvent event) { Minigame mgm = mgPlayer.getMinigame(); RecorderData recData = mgm.getRecorderData(); - if (event.getClickedBlock().getState() instanceof InventoryHolder && mgm.getActivateBlockRecorder()) { + if (event.getClickedBlock().getState() instanceof InventoryHolder && mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getClickedBlock().getLocation().getBlock(), mgPlayer); } } @@ -197,12 +197,12 @@ public void igniteBlock(BlockIgniteEvent event) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken if (recData.getWBBlocks().contains(event.getBlock().getType()) - && mgm.getActivateBlockRecorder()) { + && mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getBlock(), playerManager.getMinigamePlayer(event.getPlayer())); } //black list --> blocks that are not allowed to be broken } else if (!recData.getWBBlocks().contains(event.getBlock().getType()) - && mgm.getActivateBlockRecorder()) { + && mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getBlock(), playerManager.getMinigamePlayer(event.getPlayer())); } } else { @@ -238,12 +238,12 @@ private void hangingPlace(HangingPlaceEvent event) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken - if (recData.getWBBlocks().contains(usedMaterial) && mgm.getActivateBlockRecorder()) { + if (recData.getWBBlocks().contains(usedMaterial) && mgm.getActivatePlayerRecorder()) { recData.addEntity(event.getEntity(), mgPlayer, true); return; } //black list --> blocks that are not allowed to be broken - } else if (!recData.getWBBlocks().contains(usedMaterial) && mgm.getActivateBlockRecorder()) { + } else if (!recData.getWBBlocks().contains(usedMaterial) && mgm.getActivatePlayerRecorder()) { recData.addEntity(event.getEntity(), mgPlayer, true); return; } @@ -273,7 +273,7 @@ private void animalHurt(EntityDamageByEntityEvent event) { } if (mgPlayer != null) { - if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(animal, mgPlayer, false); } } @@ -296,7 +296,7 @@ private void hangingBreak(HangingBreakByEntityEvent event) { } if (mgPlayer != null) { - if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(event.getEntity(), mgPlayer, false); } } @@ -310,7 +310,7 @@ private void arrowShoot(EntityShootBowEvent event) { if (event.getEntity() instanceof Player player) { MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player); - if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(event.getProjectile(), mgPlayer, true); } } @@ -324,7 +324,7 @@ private void throwEnderPearl(ProjectileLaunchEvent event) { if (event.getEntity().getShooter() instanceof Player player) { MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player); - if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivateBlockRecorder()) { + if (mgPlayer.isInMinigame() && mgPlayer.getMinigame().getActivatePlayerRecorder()) { mgPlayer.getMinigame().getRecorderData().addEntity(event.getEntity(), mgPlayer, true); } } @@ -344,12 +344,12 @@ private void bucketFill(PlayerBucketFillEvent event) { if (mgm.canBlockBreak()) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken - if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivateBlockRecorder()) { + if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getBlockClicked(), playerManager.getMinigamePlayer(event.getPlayer())); } //black list --> blocks that are not allowed to be broken } else if (!recData.getWBBlocks().contains(event.getBlock().getType()) - && mgm.getActivateBlockRecorder()) { + && mgm.getActivatePlayerRecorder()) { recData.addBlock(event.getBlockClicked(), playerManager.getMinigamePlayer(event.getPlayer())); } } else { @@ -372,7 +372,7 @@ private void bucketEmpty(PlayerBucketEmptyEvent event) { if (mgm.canBlockPlace()) { if (recData.getWhitelistMode()) { //white list --> blocks that are allowed to be broken - if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivateBlockRecorder()) { + if (recData.getWBBlocks().contains(event.getBlock().getType()) && mgm.getActivatePlayerRecorder()) { Location loc = new Location(event.getBlockClicked().getWorld(), event.getBlockFace().getModX() + event.getBlockClicked().getX(), event.getBlockFace().getModY() + event.getBlockClicked().getY(), @@ -381,7 +381,7 @@ private void bucketEmpty(PlayerBucketEmptyEvent event) { } //black list --> blocks that are not allowed to be broken } else if (!recData.getWBBlocks().contains(event.getBlock().getType()) - && mgm.getActivateBlockRecorder()) { + && mgm.getActivatePlayerRecorder()) { Location loc = new Location(event.getBlockClicked().getWorld(), event.getBlockFace().getModX() + event.getBlockClicked().getX(), event.getBlockFace().getModY() + event.getBlockClicked().getY(), @@ -404,7 +404,7 @@ private void vehicleDestroy(VehicleDestroyEvent event) { MinigamePlayer mgPlayer = playerManager.getMinigamePlayer(player); Minigame mg = mgPlayer.getMinigame(); - if (mgPlayer.isInMinigame() && mg.getActivateBlockRecorder()) { + if (mgPlayer.isInMinigame() && mg.getActivatePlayerRecorder()) { mg.getRecorderData().addEntity(event.getVehicle(), mgPlayer, false); } }