EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Start of work on allowing Combat skills to be enabled for just PVP or

Browse Source 
PVE
This commit is contained in:
GJ 2012-05-01 22:42:45 -04:00
parent 84e36d758e
commit 1ae11da036
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -314,6 +314,18 @@ public class Config extends ConfigLoader {
public int getLevelCapWoodcutting() { return config.getInt("Skills.Woodcutting.Level_Cap", 0); } public int getLevelCapWoodcutting() { return config.getInt("Skills.Woodcutting.Level_Cap", 0); }
public int getPowerLevelCap() { return config.getInt("General.Power_Level_Cap", 0); } public int getPowerLevelCap() { return config.getInt("General.Power_Level_Cap", 0); }
/* PVP & PVE Settings */
public boolean getArcheryPVP() { return config.getBoolean("Skills.Archery.Enabled_For_PVP", true); }
public boolean getArcheryPVE() { return config.getBoolean("Skills.Archery.Enabled_For_PVE", true); }
public boolean getAxesPVP() { return config.getBoolean("Skills.Axes.Enabled_For_PVP", true); }
public boolean getAxesPVE() { return config.getBoolean("Skills.Axes.Enabled_For_PVE", true); }
public boolean getSwordsPVP() { return config.getBoolean("Skills.Swords.Enabled_For_PVP", true); }
public boolean getSwordsPVE() { return config.getBoolean("Skills.Swords.Enabled_For_PVE", true); }
public boolean getTamingPVP() { return config.getBoolean("Skills.Taming.Enabled_For_PVP", true); }
public boolean getTamingPVE() { return config.getBoolean("Skills.Taming.Enabled_For_PVE", true); }
public boolean getUnarmedPVP() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVP", true); }
public boolean getUnarmedPVE() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVE", true); }
/* /*
* XP SETTINGS * XP SETTINGS
*/ */

4
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -300,7 +300,7 @@ public class PlayerListener implements Listener {
McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), PP.getParty(), event.getMessage()); McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), PP.getParty(), event.getMessage());
plugin.getServer().getPluginManager().callEvent(chatEvent); plugin.getServer().getPluginManager().callEvent(chatEvent);
if(chatEvent.isCancelled()) { if (chatEvent.isCancelled()) {
return; return;
} }
@ -321,7 +321,7 @@ public class PlayerListener implements Listener {
McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), event.getMessage()); McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), event.getMessage());
plugin.getServer().getPluginManager().callEvent(chatEvent); plugin.getServer().getPluginManager().callEvent(chatEvent);
if(chatEvent.isCancelled()) { if (chatEvent.isCancelled()) {
return; return;
} }

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

@ -116,8 +116,12 @@ Skills:
Acrobatics: Acrobatics:
Level_Cap: 0 Level_Cap: 0
Archery: Archery:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0 Level_Cap: 0
Axes: Axes:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0 Level_Cap: 0
Excavation: Excavation:
Level_Cap: 0 Level_Cap: 0
@ -157,13 +161,19 @@ Skills:
Level_Required: 50 Level_Required: 50
ID: 264 ID: 264
Swords: Swords:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0 Level_Cap: 0
Taming: Taming:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0 Level_Cap: 0
Call_Of_The_Wild: Call_Of_The_Wild:
Bones_Required: 10 Bones_Required: 10
Fish_Required: 10 Fish_Required: 10
Unarmed: Unarmed:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0 Level_Cap: 0
Woodcutting: Woodcutting:
Level_Cap: 0 Level_Cap: 0