fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More accurate descriptions, and make it synchronised

Browse Source
This commit is contained in:
Electroblob77
2020-05-22 17:54:53 +01:00
parent d22c530f79
commit 6c08b21f7f
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/Settings.java
+3 -4
View File
@@ -158,8 +158,6 @@ public final class Settings {
public boolean teleportThroughUnbreakableBlocks = false;
/** <b>[Server-only]</b> Whether to allow players to damage their designated allies using magic. */
public FriendlyFire friendlyFire = FriendlyFire.ALL;
/** <b>[Server-only]</b> Whether passive mobs should count as allies, i.e. they should not be targeted by minions, lightning chaining, etc. */
public boolean passiveMobsAreAllies = false;
/** <b>[Server-only]</b> Whether to allow players to disarm other players using the telekinesis spell. */
public boolean telekineticDisarmament = true;
/** <b>[Server-only]</b> Whether summoned creatures can revenge attack their caster if their caster attacks them. */
@@ -277,6 +275,8 @@ public final class Settings {
* effect.
*/
public boolean slowTimeAffectsPlayers = true;
/** <b>[Synchronised]</b> Whether passive mobs should count as allies, i.e. they should not be damaged indirectly by spells */
public boolean passiveMobsAreAllies = false;
/** <b>[Synchronised]</b> Whether to replace Minecraft's own fireballs with wizardry fireballs. */
public boolean replaceVanillaFireballs = true;
/** <b>[Synchronised]</b> Chance of 'misreading' an undiscovered spell and triggering a forfeit instead. */
@@ -581,10 +581,9 @@ public final class Settings {
propOrder.add(property.getName());
property = config.get(DIFFICULTY_CATEGORY, "passiveMobsAreAllies", false,
"Whether passive mobs should count as allies, i.e. they should not be targeted by minions, lightning chaining, etc.");
"Whether passive mobs should count as allies, i.e. they should not be damaged indirectly by spells.");
property.setLanguageKey("config." + Wizardry.MODID + ".passive_mobs_are_allies");
Wizardry.proxy.setToNamedBooleanEntry(property);
property.setRequiresWorldRestart(false);
passiveMobsAreAllies = property.getBoolean();
propOrder.add(property.getName());
src/main/java/electroblob/wizardry/packet/PacketSyncSettings.java
+3
View File
@@ -42,6 +42,7 @@ public class PacketSyncSettings implements IMessageHandler<Message, IMessage> {
Wizardry.settings.bookshelfSearchRadius = message.settings.bookshelfSearchRadius;
Wizardry.settings.bookshelfBlocks = message.settings.bookshelfBlocks;
Wizardry.settings.bookItems = message.settings.bookItems;
Wizardry.settings.passiveMobsAreAllies = message.settings.passiveMobsAreAllies;
}
public static class Message implements IMessage {
@@ -71,6 +72,7 @@ public class PacketSyncSettings implements IMessageHandler<Message, IMessage> {
settings.bookshelfSearchRadius = buf.readInt();
settings.bookshelfBlocks = readMetaItems(buf);
settings.bookItems = readMetaItems(buf);
settings.passiveMobsAreAllies = buf.readBoolean();
}
@Override
@@ -83,6 +85,7 @@ public class PacketSyncSettings implements IMessageHandler<Message, IMessage> {
buf.writeInt(settings.bookshelfSearchRadius);
writeMetaItems(buf, settings.bookshelfBlocks);
writeMetaItems(buf, settings.bookItems);
buf.writeBoolean(settings.passiveMobsAreAllies);
}
@SuppressWarnings("unchecked")