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

Don't calculate diminshed returns when subtracting XP

Browse Source 
Any penalty XP that goes through the event after diminished returns has activated would be cancelled by this listener. This bails out early if the event is subtracting.
This commit is contained in:
Kane York 2013-06-05 10:55:19 -06:00
parent 18138b289a
commit 9a852b1baf
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gmail/nossr50/listeners/SelfListener.java
View File

@ -39,7 +39,12 @@ public class SelfListener implements Listener {
int threshold = Config.getInstance().getExperienceDeminishedReturnsThreshold(); int threshold = Config.getInstance().getExperienceDeminishedReturnsThreshold();
if (threshold <= 0) { if (threshold <= 0) {
return; return; // Dim. returns is turned off
}
final int rawXp = event.getRawXpGained();
if (rawXp < 0) {
return; // Don't calculate for XP subtraction
} }
Player player = event.getPlayer(); Player player = event.getPlayer();
@ -58,7 +63,7 @@ public class SelfListener implements Listener {
// System.out.println(difference * 100 + "% over the threshold!"); // System.out.println(difference * 100 + "% over the threshold!");
// System.out.println("Previous: " + event.getRawXpGained()); // System.out.println("Previous: " + event.getRawXpGained());
// System.out.println("Adjusted XP " + (event.getRawXpGained() - (event.getRawXpGained() * difference))); // System.out.println("Adjusted XP " + (event.getRawXpGained() - (event.getRawXpGained() * difference)));
float newValue = event.getRawXpGained() - (event.getRawXpGained() * difference); float newValue = rawXp - (rawXp * difference);
if (newValue > 0) { if (newValue > 0) {
event.setRawXpGained(newValue); event.setRawXpGained(newValue);