SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Extended names false by default, don't give json on /ld automatically

Browse Source
This commit is contained in:
libraryaddict 2020-04-01 21:39:25 +13:00
parent 901c6ef06f
commit e55f88fc73
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
4 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
View File

@ -397,7 +397,8 @@ public class DisguiseConfig {
setEntityStatusPacketsEnabled(config.getBoolean("PacketsEnabled.EntityStatus")); setEntityStatusPacketsEnabled(config.getBoolean("PacketsEnabled.EntityStatus"));
setEquipmentPacketsEnabled(config.getBoolean("PacketsEnabled.Equipment")); setEquipmentPacketsEnabled(config.getBoolean("PacketsEnabled.Equipment"));
setExplicitDisguisePermissions(config.getBoolean("Permissions.ExplicitDisguises")); setExplicitDisguisePermissions(config.getBoolean("Permissions.ExplicitDisguises"));
setExtendedDisguiseNames(config.getBoolean("ExtendedNames")); // The default value shall be false if you don't update config
setExtendedDisguiseNames(config.contains("ScoreboardNames") && config.getBoolean("ExtendedNames"));
setHideArmorFromSelf(config.getBoolean("RemoveArmor")); setHideArmorFromSelf(config.getBoolean("RemoveArmor"));
setHideDisguisedPlayers(config.getBoolean("HideDisguisedPlayersFromTab")); setHideDisguisedPlayers(config.getBoolean("HideDisguisedPlayersFromTab"));
setHideHeldItemFromSelf(config.getBoolean("RemoveHeldItem")); setHideHeldItemFromSelf(config.getBoolean("RemoveHeldItem"));

9
src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttributes.java
View File

@ -50,7 +50,10 @@ public class PacketHandlerAttributes implements IPacketHandler {
return; return;
} }
if (!disguise.isMiscDisguise()) { if (disguise.isMiscDisguise()) {
return;
}
packets.clear(); packets.clear();
List<WrappedAttribute> attributes = new ArrayList<>(); List<WrappedAttribute> attributes = new ArrayList<>();
@ -69,8 +72,7 @@ public class PacketHandlerAttributes implements IPacketHandler {
} else { } else {
builder = WrappedAttribute.newBuilder(); builder = WrappedAttribute.newBuilder();
builder.attributeKey("generic.maxHealth"); builder.attributeKey("generic.maxHealth");
builder.baseValue( builder.baseValue(DisguiseValues.getDisguiseValues(disguise.getType()).getMaxHealth());
DisguiseValues.getDisguiseValues(disguise.getType()).getMaxHealth());
} }
builder.packet(updateAttributes); builder.packet(updateAttributes);
@ -92,5 +94,4 @@ public class PacketHandlerAttributes implements IPacketHandler {
updateAttributes.getAttributeCollectionModifier().write(0, attributes); updateAttributes.getAttributeCollectionModifier().write(0, attributes);
} }
} }
}
} }

2
src/main/resources/config.yml
View File

@ -63,7 +63,7 @@ SaveDisguises:
Entities: false Entities: false
# Do names go beyond the 16 char limit for player disguises? # Do names go beyond the 16 char limit for player disguises?
ExtendedNames: true ExtendedNames: false
# Do names resolve into scoreboard teams so changing the player name is flawless? # Do names resolve into scoreboard teams so changing the player name is flawless?
# This will only work properly for names 28 chars or less in length. # This will only work properly for names 28 chars or less in length.
# Notch [DragonSlayer lvl: 28] # Notch [DragonSlayer lvl: 28]

1
src/main/resources/plugin.yml
View File

@ -106,7 +106,6 @@ permissions:
description: Allows player to get meta info description: Allows player to get meta info
libsdisguises.json: libsdisguises.json:
description: Allows player to parse held item to json description: Allows player to parse held item to json
default: true
libsdisguises.scoreboardtest: libsdisguises.scoreboardtest:
description: Test if the scoreboard is valid, this is a simple test. description: Test if the scoreboard is valid, this is a simple test.
libsdisguises.config: libsdisguises.config: