EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-01 12:05:27 +02:00
Code Issues Projects Releases Wiki Activity

Custom Serializer Attempt #2

Browse Source
This commit is contained in:
nossr50
2019-03-20 11:03:09 -07:00
parent c01b8e4ad4
commit 133dadccec
11 changed files with 127 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/party/PartyManager.java
View File

@@ -1,7 +1,6 @@
package com.gmail.nossr50.party;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.config.hocon.HOCONUtil;
import com.gmail.nossr50.datatypes.chat.ChatMode;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.party.*;
@@ -42,10 +41,10 @@ public final class PartyManager {
*/
public static int getPartyFeatureUnlockLevel(PartyFeature partyFeature)
{
if(mcMMO.getConfigManager().getPartyFeatureUnlocks().get(HOCONUtil.serializeENUMName(partyFeature.toString())) == null)
if(mcMMO.getConfigManager().getPartyFeatureUnlocks().get(partyFeature) == null)
return 0;
else
return mcMMO.getConfigManager().getPartyFeatureUnlocks().get(HOCONUtil.serializeENUMName(partyFeature.toString()));
return mcMMO.getConfigManager().getPartyFeatureUnlocks().get(partyFeature);
}
/**

5
src/main/java/com/gmail/nossr50/party/ShareHandler.java
View File

@@ -1,6 +1,5 @@
package com.gmail.nossr50.party;
import com.gmail.nossr50.config.hocon.HOCONUtil;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.party.ItemShareType;
@@ -147,10 +146,10 @@ public final class ShareHandler {
}
public static int getItemWeight(Material material) {
if(mcMMO.getConfigManager().getConfigParty().getPartyItemShare().getItemShareMap().get(HOCONUtil.serializeENUMName(material.toString())) == null)
if(mcMMO.getConfigManager().getConfigParty().getPartyItemShare().getItemShareMap().get(material) == null)
return 5;
else
return mcMMO.getConfigManager().getConfigParty().getPartyItemShare().getItemShareMap().get(HOCONUtil.serializeENUMName(material.toString()));
return mcMMO.getConfigManager().getConfigParty().getPartyItemShare().getItemShareMap().get(material);
}
public static XPGainReason getSharedXpGainReason(XPGainReason xpGainReason) {