9
0
mirror of https://github.com/Xiao-MoMi/Custom-Nameplates.git synced 2025-12-26 10:29:09 +00:00

Merge pull request #47 from thomasz05/main

Fix HasNameplateRequirement to return false if nameplate module is di…
This commit is contained in:
XiaoMoMi
2024-10-10 15:59:19 +08:00
committed by GitHub

View File

@@ -18,6 +18,7 @@
package net.momirealms.customnameplates.backend.requirement.builtin;
import net.momirealms.customnameplates.api.CNPlayer;
import net.momirealms.customnameplates.api.ConfigManager;
import net.momirealms.customnameplates.api.CustomNameplates;
import net.momirealms.customnameplates.backend.requirement.AbstractRequirement;
@@ -33,6 +34,7 @@ public class HasNameplateRequirement extends AbstractRequirement {
@Override
public boolean isSatisfied(CNPlayer p1, CNPlayer p2) {
String nameplate = p1.equippedNameplate();
if (!ConfigManager.nameplateModule()) return false;
if (nameplate.equals("none")) nameplate = CustomNameplates.getInstance().getNameplateManager().defaultNameplateId();
if (has) {
return !nameplate.equals("none");