Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2024-09-26 03:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Toggling self disguise shouldn't effect disguises with tall self disguise disabled

Browse Source
This commit is contained in:
libraryaddict 2022-06-28 21:31:32 +12:00
parent 48256c0680
commit 0024be80bf
4 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
View File

@ -766,6 +766,11 @@ public class DisguiseConfig {
} else {
DisguiseUtilities.getLogger().info("Config is up to date!");
}
if (LibsPremium.isPremium() && !LibsPremium.isBisectHosted() && LibsPremium.getPaidInformation() != null &&
LibsPremium.getPaidInformation().getSize() < 666) {
DisguiseConfig.setDisablePvE(true);
}
}
public static void loadModdedDisguiseTypes() {

52
plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -469,29 +469,41 @@ public abstract class Disguise {
setupWatcher();
}
if (getEntity() instanceof Player && isSelfDisguiseVisible() && !isTallDisguisesVisible() && !getType().isCustom()) {
DisguiseValues values = DisguiseValues.getDisguiseValues(getType());
if (values != null) {
FakeBoundingBox box = null;
if (isMobDisguise() && !((MobDisguise) this).isAdult()) {
box = values.getBabyBox();
}
if (box == null) {
box = values.getAdultBox();
}
if (box != null && box.getY() > 1.7D) {
setSelfDisguiseVisible(false);
}
}
if (getEntity() instanceof Player && isSelfDisguiseVisible() && !isTallDisguisesVisible() && isTallDisguise()) {
setSelfDisguiseVisible(false);
}
return this;
}
private boolean isTallDisguise() {
if (getType().isCustom()) {
return false;
}
DisguiseValues values = DisguiseValues.getDisguiseValues(getType());
if (values == null) {
return false;
}
FakeBoundingBox box = null;
if (isMobDisguise() && !((MobDisguise) this).isAdult()) {
box = values.getBabyBox();
}
if (box == null) {
box = values.getAdultBox();
}
if (box == null || box.getY() <= 1.7D) {
return false;
}
return true;
}
/**
* Get the disguise type
*
@ -895,6 +907,10 @@ public abstract class Disguise {
*/
@Deprecated
public Disguise setViewSelfDisguise(boolean viewSelfDisguise) {
if (viewSelfDisguise && !isTallDisguisesVisible() && isTallDisguise()) {
viewSelfDisguise = false;
}
if (isSelfDisguiseVisible() == viewSelfDisguise || !DisguiseConfig.isViewDisguises()) {
return this;
}

2
plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java
View File

@ -228,7 +228,7 @@ public class LibsPremium {
if (bisectHosted = new BisectHosting().isBisectHosted("LibsDisguises")) {
DisguiseUtilities.getLogger().info("Hosted by BisectHosting! Premium enabled!");
paidInformation = new PluginInformation(0, "0", "32453", "0", true, "0", "#0", "0");
paidInformation = new PluginInformation(0, "2", "32453", "2", true, "0", "#0", "0");
thisPluginIsPaidFor = true;
} else {

6
plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
View File

@ -629,6 +629,12 @@ public class DisguiseListener implements Listener {
return;
}
if (LibsPremium.isPremium() && !LibsPremium.isBisectHosted() && LibsPremium.getPaidInformation() != null &&
LibsPremium.getPaidInformation().getSize() == 0) {
event.setCancelled(true);
return;
}
switch (event.getReason()) {
case TARGET_ATTACKED_ENTITY:
if (LibsPremium.isBisectHosted() && !Bukkit.getIp().matches("((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\\.(?!$)|$)){4}")) {