From bd3546abc8f08f404429ca1fc446f6c8d31ea002 Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 17 Oct 2025 18:00:15 +0200 Subject: [PATCH 1/2] changed report appliance to craftattack --- .../spawn/common/appliances/metaGameplay/report/Report.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java b/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java index 9dc1e72..d5b1551 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java +++ b/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java @@ -1,7 +1,6 @@ package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report; import eu.mhsl.craftattack.spawn.common.api.repositories.ReportRepository; -import eu.mhsl.craftattack.spawn.common.api.repositories.VaroReportRepository; import eu.mhsl.craftattack.spawn.core.Main; import eu.mhsl.craftattack.spawn.core.api.client.ReqResp; import eu.mhsl.craftattack.spawn.common.api.repositories.CraftAttackReportRepository; @@ -64,7 +63,7 @@ public class Report extends Appliance { } private void createReport(Player issuer, ReportRepository.ReportCreationInfo reportRequest) { - ReqResp createdReport = this.queryRepository(VaroReportRepository.class) + ReqResp createdReport = this.queryRepository(CraftAttackReportRepository.class) // TODO: Besser machen!! .createReport(reportRequest); switch(createdReport.status()) { @@ -115,7 +114,7 @@ public class Report extends Appliance { } public void queryReports(Player issuer) { - ReqResp userReports = this.queryRepository(VaroReportRepository.class) + ReqResp userReports = this.queryRepository(CraftAttackReportRepository.class) // TODO: Besser machen!! .queryReports(issuer.getUniqueId()); if(userReports.status() != 200) { From 09abfefe3341114a8dfa6cb16f23bd7007eb01cf Mon Sep 17 00:00:00 2001 From: lars Date: Fri, 17 Oct 2025 18:39:05 +0200 Subject: [PATCH 2/2] added PhantomReducer --- .../tweaks/phantomReducer/PhantomReducer.java | 16 ++++++++++++++++ .../phantomReducer/PhantomSpawnListener.java | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomReducer.java create mode 100644 craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomSpawnListener.java diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomReducer.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomReducer.java new file mode 100644 index 0000000..45701f7 --- /dev/null +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomReducer.java @@ -0,0 +1,16 @@ +package eu.mhsl.craftattack.spawn.craftattack.appliances.tweaks.phantomReducer; + +import eu.mhsl.craftattack.spawn.core.appliance.Appliance; +import org.bukkit.event.Listener; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public class PhantomReducer extends Appliance { + @Override + protected @NotNull List listeners() { + return List.of( + new PhantomSpawnListener() + ); + } +} diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomSpawnListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomSpawnListener.java new file mode 100644 index 0000000..a1efb53 --- /dev/null +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tweaks/phantomReducer/PhantomSpawnListener.java @@ -0,0 +1,16 @@ +package eu.mhsl.craftattack.spawn.craftattack.appliances.tweaks.phantomReducer; + +import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener; +import org.bukkit.entity.Phantom; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.CreatureSpawnEvent; + +import java.util.concurrent.ThreadLocalRandom; + +class PhantomSpawnListener extends ApplianceListener { + @EventHandler + public void onPhantomSpawn(CreatureSpawnEvent event) { + if(!(event.getEntity() instanceof Phantom)) return; + if(ThreadLocalRandom.current().nextDouble() > 0.8) event.setCancelled(true); + } +}