Skip to content

Commit 1fcce6a

Browse files
committed
update config with new permission fix
1 parent 702646b commit 1fcce6a

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

src/main/java/gg/quartzdev/qmobsdropeggs/listeners/EntityDeathListener.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import gg.quartzdev.qmobsdropeggs.qMobsDropEggs;
55
import gg.quartzdev.qmobsdropeggs.util.qLogger;
66
import gg.quartzdev.qmobsdropeggs.util.qUtil;
7+
import net.kyori.adventure.text.Component;
78
import org.bukkit.Bukkit;
89
import org.bukkit.Material;
910
import org.bukkit.World;
@@ -34,34 +35,43 @@ public EntityDeathListener(){
3435

3536
@EventHandler
3637
public void onEntityDeath(EntityDeathEvent event){
38+
Bukkit.getServer().sendMessage(Component.text("entity died"));
3739
Entity entity = event.getEntity();
3840
World world = entity.getWorld();
3941

4042
// World check
4143
if(config.isDisabledWorld(world)) return;
44+
Bukkit.getServer().sendMessage(Component.text("not disabled world"));
4245

4346
Player player = event.getEntity().getKiller();
4447
if(config.requiresPlayerKiller() && player == null) return;
48+
Bukkit.getServer().sendMessage(Component.text("doesnt require player"));
4549

4650
// If a player killed the mob, check if they have the permission
4751
if(player != null && config.killerRequiresPermission()) {
52+
Bukkit.getServer().sendMessage(Component.text("player not null and requires permissions"));
4853
// Case-sensitive - I was dumb and had it 'qMDE' so check both to maintain backwards compatibility
4954
if(!player.hasPermission("qmde.killer") && !player.hasPermission("qMDE.killer")) return;
5055
}
56+
Bukkit.getServer().sendMessage(Component.text("player has permission"));
5157

5258
// Spawn Reason check
5359
SpawnReason spawnReason = entity.getEntitySpawnReason();
5460
if(config.getBlacklistedSpawnReasons().contains(spawnReason)){
61+
Bukkit.getServer().sendMessage(Component.text("spawn reason is blacklisted"));
5562
if(!config.invertBlacklistedSpawnReasons()){
5663
return;
5764
}
65+
Bukkit.getServer().sendMessage(Component.text("but we're inverting blacklist"));
5866
}
5967

6068
// Mob check
6169
EntityType mobType = entity.getType();
6270
if(config.isBlacklistedMob(mobType)) return;
71+
Bukkit.getServer().sendMessage(Component.text("not a blacklisted mob"));
6372
ItemStack spawnEgg = createSpawnEgg(entity.getType());
6473
if(spawnEgg == null) return;
74+
Bukkit.getServer().sendMessage(Component.text("found a spawn egg for this mob type"));
6575

6676
// RNG
6777
ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -71,18 +81,28 @@ public void onEntityDeath(EntityDeathEvent event){
7181

7282
// Looting check
7383
if(player != null && config.factoringLooting()) {
84+
Bukkit.getServer().sendMessage(Component.text("player not null so we're factoring looting"));
7485
if (player.getInventory().getItemInMainHand().containsEnchantment(Enchantment.LOOTING)) {
86+
Bukkit.getServer().sendMessage(Component.text("player has looting"));
7587
int lootingLevel = player.getInventory().getItemInMainHand().getEnchantmentLevel(Enchantment.LOOTING);
7688
if (config.complexLooting() && dropChance < config.complexLootingBreakpoint())
7789
dropChance = dropChance * (1 + lootingLevel);
7890
else
7991
dropChance = dropChance + lootingLevel;
8092
}
8193
}
94+
95+
Bukkit.getServer().sendMessage(Component.text("looting math finished"));
8296
// Checks RNG
8397
if(rng <= dropChance)
98+
{
99+
100+
Bukkit.getServer().sendMessage(Component.text("rng passed agg dropping"));
84101
// Adds spawn egg
85102
event.getDrops().add(spawnEgg);
103+
return;
104+
}
105+
Bukkit.getServer().sendMessage(Component.text("rng failed not dropping egg"));
86106
}
87107

88108
private @Nullable ItemStack createSpawnEgg(EntityType type){

src/main/java/gg/quartzdev/qmobsdropeggs/qConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public boolean requiresPlayerKiller(){
8989
}
9090

9191
private void loadKillerRequiresPermission(){
92-
this.KILLER_REQUIRES_PERMISSION = this.file.getBoolean("killer-requires-permissions");
92+
this.KILLER_REQUIRES_PERMISSION = this.file.getBoolean("killer-requires-permission");
9393
}
9494

9595
public boolean killerRequiresPermission(){

0 commit comments

Comments
 (0)