maj/MobScores
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates spotless and adds a license header.

Browse Source
This commit is contained in:
Tom Hicks
2026-09-27 02:29:43 -07:00
parent 39998917ab
commit db43411628
6 changed files with 427 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Human-Tests.md Normal file
View File

@@ -0,0 +1,41 @@
# MobScores Human Testing
Use this checklist on a disposable Paper 26.2 or 26.3 server with Java 25+, MobScores, and ScoreKeeper 0.2.2 or newer installed. MobScores depends on ScoreKeeper for its `mob-scores` bucket, and its main behavior is driven by real combat and player-join events.
## Test Setup
- Back up the world and both plugin data folders. Configure a test server with the same plugin versions intended for production.
- Use at least two ordinary player accounts and an operator for setup. Keep the server log visible to catch dependency, config, and offline-award warnings.
- Save the generated `plugins/MobScores/config.yml` before changing it. Restart after config edits; MobScores reads the score table during plugin startup.
- Record player UUIDs, mob types, configured values, active score buckets, and scores before and after each kill.
## Human Checklist
### Plugin loading and configuration
- Start with both plugins installed. Confirm ScoreKeeper loads before MobScores, MobScores enables, and the `mob-scores` bucket exists with the expected labels and initial value.
- On a disposable server, test startup without ScoreKeeper and with a ScoreKeeper version older than 0.2.2. Paper should reject the missing hard dependency; MobScores should disable itself with a version warning for an outdated dependency. Then restore the supported version.
- On first startup, inspect the generated `ScoreTable`. Confirm the documented default entity values are present, including a zero-valued entry.
- Change a few values, restart, and verify they are loaded and preserved. Include a zero value and an unknown entity key; confirm zero-valued entities are omitted from join messages and invalid entries are logged without preventing valid entries from loading.
- Confirm the table uses Paper `EntityType` names and that malformed values or a missing score-table section are handled as intended.
### Kill credit and scoring
- As a player, kill configured entities using direct melee damage and player-fired projectiles. Confirm the expected points are added to that player's `mob-scores` score.
- Check the boundary cases: a non-player attacker, environmental death, an entity type absent from the table, and a configured zero-point entity. Confirm no unintended points are awarded.
- Have two players damage the same mob before it dies. The current implementation records the most recent direct or player-projectile attacker; verify that this credit policy matches the server's expectations.
- Damage a mob with a player, then let it die from fall, fire, or another environmental cause. Confirm whether retaining that player's credit is the intended behavior; the current implementation keeps the last recorded player attribution until the mob dies.
- Test a player who disconnects after damaging the mob but before it dies. The current implementation cannot award an offline player and logs a warning; confirm this is acceptable and that no other player's score changes.
- Check mob death without any previous qualifying player damage, and verify no stale or reused entity attribution grants points.
### Player messaging and ScoreKeeper workflows
- Join with a player account. Confirm the MobScores score table is sent once, includes configured nonzero entity types with the right values, and excludes zero-valued types.
- Run `/score-bucket mob-scores` followed by `/score-get`. Confirm the score reflects kills and the bucket switch message uses the expected singular/plural label. Verify MobScores does not change the player's active bucket automatically on join or kill.
- Give two players different kill totals and switch between `mob-scores` and another ScoreKeeper bucket. Confirm each bucket retains its own value and MobScores awards only to `mob-scores`.
- Restart the server and verify MobScores retains its configured table and ScoreKeeper retains the players' mob scores. Reconnect and confirm the join table still matches the active config.
- Exercise normal gameplay around claimed mobs: unload/reload chunks, kill several entities rapidly, and test multiplayer combat. Watch for missed, duplicated, or cross-player awards.
## Automated Coverage
There are currently no Java test sources in MobScores and no `integrationTest` source set/task. Although Gradle declares JUnit, `./gradlew test` currently has no MobScores behavior tests. The testing tasks marked “Ready” in `TODO.md` have not been implemented. Build success alone does not verify real event attribution or compatibility with the installed ScoreKeeper jar.

12
build.gradle
View File

@@ -5,6 +5,7 @@
*/ */
plugins { plugins {
id 'com.diffplug.spotless' version '8.10.3'
id 'java-library' id 'java-library'
id 'maven-publish' id 'maven-publish'
id 'org.danilopianini.git-sensitive-semantic-versioning' version '7.0.24' id 'org.danilopianini.git-sensitive-semantic-versioning' version '7.0.24'
@@ -91,3 +92,14 @@ processResources {
expand(version: pluginVersion) expand(version: pluginVersion)
} }
} }
spotless {
java {
googleJavaFormat('1.36.1')
importOrder 'java', 'javax', 'com', 'net', 'org', ''
licenseHeaderFile 'config/license-header.txt'
target 'src/**/*.java'
removeUnusedImports()
toggleOffOn()
}
}

10
License-Header.txt → config/license-header.txt
View File

@@ -1,17 +1,17 @@
/* /*
This file is part of MobScores. This file is part of Mob Scores.
MobScores is free software: you can redistribute it and/or modify Mob Scores is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
MobScores is distributed in the hope that it will be useful, Mob Scores is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with MobScores. If not, see <http://www.gnu.org/licenses/>. along with Mob Scores. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/ */

441
src/main/java/com/majinnaibu/minecraft/plugins/mobscores/MobScoresPlugin.java
View File

@@ -1,18 +1,18 @@
/* /*
This file is part of MobScores. This file is part of Mob Scores.
MobScores is free software: you can redistribute it and/or modify Mob Scores is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
MobScores is distributed in the hope that it will be useful, Mob Scores is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with MobScores. If not, see <http://www.gnu.org/licenses/>. along with Mob Scores. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/ */
package com.majinnaibu.minecraft.plugins.mobscores; package com.majinnaibu.minecraft.plugins.mobscores;
@@ -23,6 +23,10 @@ import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import com.majinnaibu.minecraft.plugins.mobscores.listeners.MobDeathListener;
import com.majinnaibu.minecraft.plugins.mobscores.listeners.PlayerConnectListener;
import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
@@ -32,232 +36,233 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.majinnaibu.minecraft.plugins.mobscores.listeners.MobDeathListener;
import com.majinnaibu.minecraft.plugins.mobscores.listeners.PlayerConnectListener;
import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin;
public class MobScoresPlugin extends JavaPlugin { public class MobScoresPlugin extends JavaPlugin {
private static final String SCORE_BUCKET_ID = "mob-scores"; private static final String SCORE_BUCKET_ID = "mob-scores";
private static final String MIN_SCORE_KEEPER_VERSION = "0.2.2"; private static final String MIN_SCORE_KEEPER_VERSION = "0.2.2";
private Map<UUID, UUID> _claimedMobs = new HashMap<UUID, UUID>(); private Map<UUID, UUID> _claimedMobs = new HashMap<UUID, UUID>();
private Map<EntityType, Integer> _scoreTable = new HashMap<EntityType, Integer>(); private Map<EntityType, Integer> _scoreTable = new HashMap<EntityType, Integer>();
private ScoreKeeperPlugin _scoreKeeper = null; private ScoreKeeperPlugin _scoreKeeper = null;
private final String _logPrefix = "[MobScores] "; private final String _logPrefix = "[MobScores] ";
private final Component _messagePrefix = Component.text("[") private final Component _messagePrefix =
.append(Component.text("MobScores").color(NamedTextColor.AQUA)) Component.text("[")
.append(Component.text("] ").color(NamedTextColor.WHITE)); .append(Component.text("MobScores").color(NamedTextColor.AQUA))
.append(Component.text("] ").color(NamedTextColor.WHITE));
@Override @Override
public void onDisable() { public void onDisable() {
getConfig().set("ScoreTable", serializeScoreTable(_scoreTable)); getConfig().set("ScoreTable", serializeScoreTable(_scoreTable));
saveConfig(); saveConfig();
} }
@Override @Override
public void onEnable() { public void onEnable() {
// Create the default config if it doesn't exist. // Create the default config if it doesn't exist.
saveDefaultConfig(); saveDefaultConfig();
// Load our score table from config or set defaults. // Load our score table from config or set defaults.
if (getConfig().isConfigurationSection("ScoreTable")) { if (getConfig().isConfigurationSection("ScoreTable")) {
_scoreTable = deserializeScoreTable(getConfig().getConfigurationSection("ScoreTable").getValues(false)); _scoreTable =
} else { deserializeScoreTable(getConfig().getConfigurationSection("ScoreTable").getValues(false));
_scoreTable = getDefaultScoreTable(); } else {
getConfig().set("ScoreTable", serializeScoreTable(_scoreTable)); _scoreTable = getDefaultScoreTable();
saveConfig(); getConfig().set("ScoreTable", serializeScoreTable(_scoreTable));
} saveConfig();
PluginManager pm = getServer().getPluginManager();
ScoreKeeperPlugin scoreKeeper = (ScoreKeeperPlugin)pm.getPlugin("ScoreKeeper");
if (scoreKeeper == null) {
logWarning("Unable to find ScoreKeeper plugin.");
pm.disablePlugin(this);
return;
}
String scoreKeeperVersion = scoreKeeper.getPluginMeta().getVersion();
if (!isVersionAtLeast(scoreKeeperVersion, MIN_SCORE_KEEPER_VERSION)) {
logWarning(
"ScoreKeeper "
+ MIN_SCORE_KEEPER_VERSION
+ " or newer is required; found "
+ scoreKeeperVersion
+ ".");
pm.disablePlugin(this);
return;
}
_scoreKeeper = scoreKeeper;
if (_scoreKeeper.getBucket(SCORE_BUCKET_ID) == null) {
_scoreKeeper.createBucket(SCORE_BUCKET_ID, "mob point", "mob points", 0);
}
pm.registerEvents(new MobDeathListener(this), this);
pm.registerEvents(new PlayerConnectListener(this), this);
logInfo(getPluginMeta().getName() + " version " + getPluginMeta().getVersion() + " is enabled!");
}
private HashMap<EntityType, Integer> getDefaultScoreTable() {
HashMap<EntityType, Integer> scores = new HashMap<EntityType, Integer>();
scores.put(EntityType.BLAZE, 100);
scores.put(EntityType.CAVE_SPIDER, 100);
scores.put(EntityType.CREEPER, 50);
scores.put(EntityType.DROWNED, 25);
scores.put(EntityType.ELDER_GUARDIAN, 250);
scores.put(EntityType.ENDERMAN, 100);
scores.put(EntityType.ENDERMITE, 1000);
scores.put(EntityType.END_CRYSTAL, 250);
scores.put(EntityType.GHAST, 250);
scores.put(EntityType.GIANT, 250);
scores.put(EntityType.GUARDIAN, 250);
scores.put(EntityType.HUSK, 25);
scores.put(EntityType.PILLAGER, 25);
scores.put(EntityType.RAVAGER, 50);
scores.put(EntityType.SHULKER, 50);
scores.put(EntityType.SILVERFISH, 0);
scores.put(EntityType.SKELETON, 50);
scores.put(EntityType.WITHER_SKELETON, 100);
scores.put(EntityType.ZOMBIE, 25);
scores.put(EntityType.SLIME, 100);
scores.put(EntityType.SPIDER, 50);
return scores;
}
public void claimMob(Entity entity, Player damager) {
if (_scoreTable.containsKey(entity.getType())) {
_claimedMobs.put(entity.getUniqueId(), damager.getUniqueId());
}
}
public void awardScore(Entity entity) {
UUID playerId = _claimedMobs.remove(entity.getUniqueId());
if(playerId != null){
EntityType type = entity.getType();
if (_scoreTable.containsKey(type)) {
Player player = getServer().getPlayer(playerId);
if (player == null) {
logWarning("Unable to award score because the credited player is offline.");
return;
}
int score = _scoreTable.get(type);
_scoreKeeper.addScore(player, SCORE_BUCKET_ID, score);
} else {
logWarning("Unable to award score for {" + type.toString() + "}");
}
}
}
public void sendPlayerScoreTable(Player player) {
for (Map.Entry<EntityType, Integer> entry : _scoreTable.entrySet()) {
if (entry.getValue() != 0) {
EntityType type = entry.getKey();
Component message = Component.translatable(Objects.requireNonNull(type.translationKey()))
.append(Component.text(" = "))
.append(Component.text(Objects.requireNonNull(String.valueOf(entry.getValue())))
.color(NamedTextColor.GREEN));
sendPlayerMessage(player, message);
}
}
}
private Map<EntityType, Integer> deserializeScoreTable(Map<String, Object> rawValue) {
HashMap<EntityType, Integer> scoreTable = new HashMap<>();
if (rawValue instanceof Map) {
scoreTable = new HashMap<>();
for (Map.Entry<String, Object> entry : rawValue.entrySet()) {
try {
EntityType type = EntityType.valueOf(entry.getKey());
Integer value = ((Number) entry.getValue()).intValue();
scoreTable.put(type, value);
} catch (Exception ex) {
logError(ex);
}
}
return scoreTable;
} else {
return getDefaultScoreTable();
}
}
private Map<String, Integer> serializeScoreTable(Map<EntityType, Integer> scoreTable) {
Map<String, Integer> serializable = new HashMap<>();
for (Map.Entry<EntityType, Integer> entry : scoreTable.entrySet()) {
serializable.put(entry.getKey().name(), entry.getValue());
}
return serializable;
} }
public void sendPlayerMessage(Player player, Component message) { PluginManager pm = getServer().getPluginManager();
player.sendMessage(_messagePrefix.append(Objects.requireNonNull(message))); ScoreKeeperPlugin scoreKeeper = (ScoreKeeperPlugin) pm.getPlugin("ScoreKeeper");
}
public void sendPlayerMessage(Player player, String message) { if (scoreKeeper == null) {
player.sendMessage(_messagePrefix.append(Component.text(Objects.requireNonNull(message)))); logWarning("Unable to find ScoreKeeper plugin.");
} pm.disablePlugin(this);
return;
}
public void logError(Exception ex) { String scoreKeeperVersion = scoreKeeper.getPluginMeta().getVersion();
getLogger().log(Level.SEVERE, _logPrefix + ex.toString()); if (!isVersionAtLeast(scoreKeeperVersion, MIN_SCORE_KEEPER_VERSION)) {
} logWarning(
"ScoreKeeper "
+ MIN_SCORE_KEEPER_VERSION
+ " or newer is required; found "
+ scoreKeeperVersion
+ ".");
pm.disablePlugin(this);
return;
}
_scoreKeeper = scoreKeeper;
if (_scoreKeeper.getBucket(SCORE_BUCKET_ID) == null) {
_scoreKeeper.createBucket(SCORE_BUCKET_ID, "mob point", "mob points", 0);
}
public void logInfo(String messag) { pm.registerEvents(new MobDeathListener(this), this);
getLogger().info(_logPrefix + messag); pm.registerEvents(new PlayerConnectListener(this), this);
}
public void logWarning(String message) { logInfo(
getLogger().warning(_logPrefix + message); getPluginMeta().getName() + " version " + getPluginMeta().getVersion() + " is enabled!");
} }
private boolean isVersionAtLeast(String version, String minimumVersion) { private HashMap<EntityType, Integer> getDefaultScoreTable() {
int[] actual = parseVersion(version); HashMap<EntityType, Integer> scores = new HashMap<EntityType, Integer>();
int[] minimum = parseVersion(minimumVersion);
if (actual == null || minimum == null) {
return false;
}
for (int index = 0; index < actual.length; index++) {
if (actual[index] != minimum[index]) {
return actual[index] > minimum[index];
}
}
return !isPrerelease(version);
}
private int[] parseVersion(String version) { scores.put(EntityType.BLAZE, 100);
if (version == null) { scores.put(EntityType.CAVE_SPIDER, 100);
return null; scores.put(EntityType.CREEPER, 50);
} scores.put(EntityType.DROWNED, 25);
String coreVersion = version.replaceFirst("^[vV]", ""); scores.put(EntityType.ELDER_GUARDIAN, 250);
int metadataIndex = coreVersion.indexOf('+'); scores.put(EntityType.ENDERMAN, 100);
if (metadataIndex >= 0) { scores.put(EntityType.ENDERMITE, 1000);
coreVersion = coreVersion.substring(0, metadataIndex); scores.put(EntityType.END_CRYSTAL, 250);
} scores.put(EntityType.GHAST, 250);
int prereleaseIndex = coreVersion.indexOf('-'); scores.put(EntityType.GIANT, 250);
if (prereleaseIndex >= 0) { scores.put(EntityType.GUARDIAN, 250);
coreVersion = coreVersion.substring(0, prereleaseIndex); scores.put(EntityType.HUSK, 25);
} scores.put(EntityType.PILLAGER, 25);
String[] parts = coreVersion.split("\\."); scores.put(EntityType.RAVAGER, 50);
if (parts.length < 3) { scores.put(EntityType.SHULKER, 50);
return null; scores.put(EntityType.SILVERFISH, 0);
} scores.put(EntityType.SKELETON, 50);
try { scores.put(EntityType.WITHER_SKELETON, 100);
return new int[] { scores.put(EntityType.ZOMBIE, 25);
Integer.parseInt(parts[0]), Integer.parseInt(parts[1]), Integer.parseInt(parts[2]) scores.put(EntityType.SLIME, 100);
}; scores.put(EntityType.SPIDER, 50);
} catch (NumberFormatException ex) {
return null;
}
}
private boolean isPrerelease(String version) { return scores;
String release = version.replaceFirst("^[vV]", ""); }
int metadataIndex = release.indexOf('+');
if (metadataIndex >= 0) { public void claimMob(Entity entity, Player damager) {
release = release.substring(0, metadataIndex); if (_scoreTable.containsKey(entity.getType())) {
} _claimedMobs.put(entity.getUniqueId(), damager.getUniqueId());
return release.indexOf('-') >= 0; }
} }
public void awardScore(Entity entity) {
UUID playerId = _claimedMobs.remove(entity.getUniqueId());
if (playerId != null) {
EntityType type = entity.getType();
if (_scoreTable.containsKey(type)) {
Player player = getServer().getPlayer(playerId);
if (player == null) {
logWarning("Unable to award score because the credited player is offline.");
return;
}
int score = _scoreTable.get(type);
_scoreKeeper.addScore(player, SCORE_BUCKET_ID, score);
} else {
logWarning("Unable to award score for {" + type.toString() + "}");
}
}
}
public void sendPlayerScoreTable(Player player) {
for (Map.Entry<EntityType, Integer> entry : _scoreTable.entrySet()) {
if (entry.getValue() != 0) {
EntityType type = entry.getKey();
Component message =
Component.translatable(Objects.requireNonNull(type.translationKey()))
.append(Component.text(" = "))
.append(
Component.text(Objects.requireNonNull(String.valueOf(entry.getValue())))
.color(NamedTextColor.GREEN));
sendPlayerMessage(player, message);
}
}
}
private Map<EntityType, Integer> deserializeScoreTable(Map<String, Object> rawValue) {
HashMap<EntityType, Integer> scoreTable = new HashMap<>();
if (rawValue instanceof Map) {
scoreTable = new HashMap<>();
for (Map.Entry<String, Object> entry : rawValue.entrySet()) {
try {
EntityType type = EntityType.valueOf(entry.getKey());
Integer value = ((Number) entry.getValue()).intValue();
scoreTable.put(type, value);
} catch (Exception ex) {
logError(ex);
}
}
return scoreTable;
} else {
return getDefaultScoreTable();
}
}
private Map<String, Integer> serializeScoreTable(Map<EntityType, Integer> scoreTable) {
Map<String, Integer> serializable = new HashMap<>();
for (Map.Entry<EntityType, Integer> entry : scoreTable.entrySet()) {
serializable.put(entry.getKey().name(), entry.getValue());
}
return serializable;
}
public void sendPlayerMessage(Player player, Component message) {
player.sendMessage(_messagePrefix.append(Objects.requireNonNull(message)));
}
public void sendPlayerMessage(Player player, String message) {
player.sendMessage(_messagePrefix.append(Component.text(Objects.requireNonNull(message))));
}
public void logError(Exception ex) {
getLogger().log(Level.SEVERE, _logPrefix + ex.toString());
}
public void logInfo(String messag) {
getLogger().info(_logPrefix + messag);
}
public void logWarning(String message) {
getLogger().warning(_logPrefix + message);
}
private boolean isVersionAtLeast(String version, String minimumVersion) {
int[] actual = parseVersion(version);
int[] minimum = parseVersion(minimumVersion);
if (actual == null || minimum == null) {
return false;
}
for (int index = 0; index < actual.length; index++) {
if (actual[index] != minimum[index]) {
return actual[index] > minimum[index];
}
}
return !isPrerelease(version);
}
private int[] parseVersion(String version) {
if (version == null) {
return null;
}
String coreVersion = version.replaceFirst("^[vV]", "");
int metadataIndex = coreVersion.indexOf('+');
if (metadataIndex >= 0) {
coreVersion = coreVersion.substring(0, metadataIndex);
}
int prereleaseIndex = coreVersion.indexOf('-');
if (prereleaseIndex >= 0) {
coreVersion = coreVersion.substring(0, prereleaseIndex);
}
String[] parts = coreVersion.split("\\.");
if (parts.length < 3) {
return null;
}
try {
return new int[] {
Integer.parseInt(parts[0]), Integer.parseInt(parts[1]), Integer.parseInt(parts[2])
};
} catch (NumberFormatException ex) {
return null;
}
}
private boolean isPrerelease(String version) {
String release = version.replaceFirst("^[vV]", "");
int metadataIndex = release.indexOf('+');
if (metadataIndex >= 0) {
release = release.substring(0, metadataIndex);
}
return release.indexOf('-') >= 0;
}
} }

74
src/main/java/com/majinnaibu/minecraft/plugins/mobscores/listeners/MobDeathListener.java
View File

@@ -1,66 +1,64 @@
/* /*
This file is part of MobScores. This file is part of Mob Scores.
MobScores is free software: you can redistribute it and/or modify Mob Scores is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
MobScores is distributed in the hope that it will be useful, Mob Scores is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with MobScores. If not, see <http://www.gnu.org/licenses/>. along with Mob Scores. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/ */
package com.majinnaibu.minecraft.plugins.mobscores.listeners; package com.majinnaibu.minecraft.plugins.mobscores.listeners;
import com.majinnaibu.minecraft.plugins.mobscores.MobScoresPlugin;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import com.majinnaibu.minecraft.plugins.mobscores.MobScoresPlugin;
public class MobDeathListener implements Listener { public class MobDeathListener implements Listener {
private MobScoresPlugin _plugin = null; private MobScoresPlugin _plugin = null;
public MobDeathListener(MobScoresPlugin plugin) { public MobDeathListener(MobScoresPlugin plugin) {
_plugin = plugin; _plugin = plugin;
} }
@EventHandler @EventHandler
public void onEntityDamage(EntityDamageEvent event) { public void onEntityDamage(EntityDamageEvent event) {
if (!(event instanceof EntityDamageByEntityEvent damageEvent)) { if (!(event instanceof EntityDamageByEntityEvent damageEvent)) {
return; return;
} }
Entity damager = damageEvent.getDamager(); Entity damager = damageEvent.getDamager();
Player creditedPlayer = null; Player creditedPlayer = null;
if (damager instanceof Player directPlayer) { if (damager instanceof Player directPlayer) {
creditedPlayer = directPlayer; creditedPlayer = directPlayer;
} else if (damager instanceof Projectile projectile } else if (damager instanceof Projectile projectile
&& projectile.getShooter() instanceof Player projectileShooter) { && projectile.getShooter() instanceof Player projectileShooter) {
creditedPlayer = projectileShooter; creditedPlayer = projectileShooter;
} }
if (creditedPlayer != null) { if (creditedPlayer != null) {
_plugin.claimMob(event.getEntity(), creditedPlayer); _plugin.claimMob(event.getEntity(), creditedPlayer);
} }
} }
@EventHandler @EventHandler
public void onEntityDeath(EntityDeathEvent event) { public void onEntityDeath(EntityDeathEvent event) {
_plugin.awardScore(event.getEntity()); _plugin.awardScore(event.getEntity());
} }
@EventHandler
public void onEntityExplode(EntityExplodeEvent event) {
}
@EventHandler
public void onEntityExplode(EntityExplodeEvent event) {}
} }

34
src/main/java/com/majinnaibu/minecraft/plugins/mobscores/listeners/PlayerConnectListener.java
View File

@@ -1,37 +1,37 @@
/* /*
This file is part of MobScores. This file is part of Mob Scores.
MobScores is free software: you can redistribute it and/or modify Mob Scores is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
MobScores is distributed in the hope that it will be useful, Mob Scores is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with MobScores. If not, see <http://www.gnu.org/licenses/>. along with Mob Scores. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/ */
package com.majinnaibu.minecraft.plugins.mobscores.listeners; package com.majinnaibu.minecraft.plugins.mobscores.listeners;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.Listener;
import org.bukkit.event.EventHandler;
import com.majinnaibu.minecraft.plugins.mobscores.MobScoresPlugin; import com.majinnaibu.minecraft.plugins.mobscores.MobScoresPlugin;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
public class PlayerConnectListener implements Listener { public class PlayerConnectListener implements Listener {
private MobScoresPlugin _plugin = null; private MobScoresPlugin _plugin = null;
public PlayerConnectListener(MobScoresPlugin plugin) { public PlayerConnectListener(MobScoresPlugin plugin) {
_plugin = plugin; _plugin = plugin;
} }
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
_plugin.sendPlayerScoreTable(event.getPlayer()); _plugin.sendPlayerScoreTable(event.getPlayer());
} }
} }