1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-06 14:46:32 +02:00

Adjustments to negative eco give/take.

This commit is contained in:
KHobbits
2012-02-26 05:01:40 +00:00
parent 0ca7613976
commit 7ce9f719c1
9 changed files with 17 additions and 16 deletions

View File

@@ -160,9 +160,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
public boolean canAfford(final double cost, final boolean permcheck) public boolean canAfford(final double cost, final boolean permcheck)
{ {
final double mon = getMoney(); final double mon = getMoney();
ess.getLogger().log(Level.INFO, "min cash is " + ess.getSettings().getMinMoney());
if (!permcheck || isAuthorized("essentials.eco.loan")) if (!permcheck || isAuthorized("essentials.eco.loan"))
{ {
return (mon + cost) > ess.getSettings().getMinMoney(); return (mon - cost) > ess.getSettings().getMinMoney();
} }
return cost <= mon; return cost <= mon;
} }

View File

@@ -203,7 +203,7 @@ public class User extends UserBase implements IUser
final double mon = getMoney(); final double mon = getMoney();
if (isAuthorized("essentials.eco.loan")) if (isAuthorized("essentials.eco.loan"))
{ {
return (mon + cost) > ess.getSettings().getMinMoney(); return (mon - cost) > ess.getSettings().getMinMoney();
} }
return cost <= mon; return cost <= mon;
} }

View File

@@ -4,7 +4,7 @@
# by: # by:
action=* {0} {1} action=* {0} {1}
addedToAccount=\u00a7a{0} has been added to your account. addedToAccount=\u00a7a{0} has been added to your account.
addedToOthersAccount=\u00a7a{0} has been added to {1} account. New balance: {2} addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
alertBroke=broke: alertBroke=broke:
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3} alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3}
alertPlaced=placed: alertPlaced=placed:
@@ -318,7 +318,7 @@ suicideMessage=\u00a77Goodbye Cruel World...
suicideSuccess= \u00a77{0} took their own life suicideSuccess= \u00a77{0} took their own life
survival=survival survival=survival
takenFromAccount=\u00a7c{0} has been taken from your account. takenFromAccount=\u00a7c{0} has been taken from your account.
takenFromOthersAccount=\u00a7c{0} has been taken from {1} account. New balance: {2} takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
teleportAAll=\u00a77Teleporting request sent to all players... teleportAAll=\u00a77Teleporting request sent to all players...
teleportAll=\u00a77Teleporting all players... teleportAll=\u00a77Teleporting all players...
teleportationCommencing=\u00a77Teleportation commencing... teleportationCommencing=\u00a77Teleportation commencing...

View File

@@ -4,7 +4,7 @@
# by: Dysp, dysperen@gmail.com # by: Dysp, dysperen@gmail.com
action=* {0} {1} action=* {0} {1}
addedToAccount=\u00a7a{0} er blevet tilf\u00f8jet til din konto. addedToAccount=\u00a7a{0} er blevet tilf\u00f8jet til din konto.
addedToOthersAccount=\u00a7a{0} has been added to {1} account. New balance: {2} addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
alertBroke=\u00f8delagde: alertBroke=\u00f8delagde:
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} ved: {3} alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} ved: {3}
alertPlaced=placerede: alertPlaced=placerede:
@@ -318,7 +318,7 @@ suicideMessage=\u00a77Farvel grusomme verden...
suicideSuccess= \u00a77{0} tog sit eget liv suicideSuccess= \u00a77{0} tog sit eget liv
survival=survival survival=survival
takenFromAccount=\u00a7c{0} er blevet taget fra din konto. takenFromAccount=\u00a7c{0} er blevet taget fra din konto.
takenFromOthersAccount=\u00a7c{0} has been taken from {1} account. New balance: {2} takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
teleportAAll=\u00a77Anmodning om teleport er sendt til alle spillere. teleportAAll=\u00a77Anmodning om teleport er sendt til alle spillere.
teleportAll=\u00a77Teleporterer alle spillere... teleportAll=\u00a77Teleporterer alle spillere...
teleportationCommencing=\u00a77Teleport begynder... teleportationCommencing=\u00a77Teleport begynder...

View File

@@ -4,7 +4,7 @@
# by: # by:
action=* {0} {1} action=* {0} {1}
addedToAccount=\u00a7a{0} wurden zu deiner Geldb\u00f6rse hinzugef\u00fcgt. addedToAccount=\u00a7a{0} wurden zu deiner Geldb\u00f6rse hinzugef\u00fcgt.
addedToOthersAccount=\u00a7a{0} has been added to {1} account. New balance: {2} addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
alertBroke=zerst\u00f6rt: alertBroke=zerst\u00f6rt:
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} bei: {3} alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} bei: {3}
alertPlaced=platziert: alertPlaced=platziert:
@@ -318,7 +318,7 @@ suicideMessage=\u00a77Lebewohl grausame Welt...
suicideSuccess= \u00a77{0} hat sich das Leben genommen. suicideSuccess= \u00a77{0} hat sich das Leben genommen.
survival=survival survival=survival
takenFromAccount=\u00a7c{0} wurden aus deiner Geldb\u00f6rse genommen. takenFromAccount=\u00a7c{0} wurden aus deiner Geldb\u00f6rse genommen.
takenFromOthersAccount=\u00a7c{0} has been taken from {1} account. New balance: {2} takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
teleportAAll=\u00a77Teleportierungsanfrage zu allen Spielern gesendet... teleportAAll=\u00a77Teleportierungsanfrage zu allen Spielern gesendet...
teleportAll=\u00a77Teleportiere alle Spieler... teleportAll=\u00a77Teleportiere alle Spieler...
teleportAtoB=\u00a77{0}\u00a77 teleportiert dich zu {1}\u00a77. teleportAtoB=\u00a77{0}\u00a77 teleportiert dich zu {1}\u00a77.

View File

@@ -4,7 +4,7 @@
# by: # by:
action=* {0} {1} action=* {0} {1}
addedToAccount=\u00a7a{0} has been added to your account. addedToAccount=\u00a7a{0} has been added to your account.
addedToOthersAccount=\u00a7a{0} has been added to {1} account. New balance: {2} addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
alertBroke=broke: alertBroke=broke:
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3} alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} at: {3}
alertPlaced=placed: alertPlaced=placed:
@@ -318,7 +318,7 @@ suicideMessage=\u00a77Goodbye Cruel World...
suicideSuccess= \u00a77{0} took their own life suicideSuccess= \u00a77{0} took their own life
survival=survival survival=survival
takenFromAccount=\u00a7c{0} has been taken from your account. takenFromAccount=\u00a7c{0} has been taken from your account.
takenFromOthersAccount=\u00a7c{0} has been taken from {1} account. New balance: {2} takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
teleportAAll=\u00a77Teleporting request sent to all players... teleportAAll=\u00a77Teleporting request sent to all players...
teleportAll=\u00a77Teleporting all players... teleportAll=\u00a77Teleporting all players...
teleportationCommencing=\u00a77Teleportation commencing... teleportationCommencing=\u00a77Teleportation commencing...

View File

@@ -4,7 +4,7 @@
# by: # by:
action=* {0} {1} action=* {0} {1}
addedToAccount=\u00a7a{0} ha sido agregado a tu cuenta. addedToAccount=\u00a7a{0} ha sido agregado a tu cuenta.
addedToOthersAccount=\u00a7a{0} has been added to {1} account. New balance: {2} addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
alertBroke=roto: alertBroke=roto:
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} en: {3} alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} en: {3}
alertPlaced=situado: alertPlaced=situado:
@@ -318,7 +318,7 @@ suicideMessage=\u00a77Adios mundo cruel...
suicideSuccess= \u00a77{0} se quito su propia vida suicideSuccess= \u00a77{0} se quito su propia vida
survival=survival survival=survival
takenFromAccount=\u00a7c{0} ha sido sacado de tu cuenta. takenFromAccount=\u00a7c{0} ha sido sacado de tu cuenta.
takenFromOthersAccount=\u00a7c{0} has been taken from {1} account. New balance: {2} takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
teleportAAll=\u00a77Peticion de teletransporte enviada a todos los jugadores... teleportAAll=\u00a77Peticion de teletransporte enviada a todos los jugadores...
teleportAll=\u00a77Teletransportando a todos los jugadores... teleportAll=\u00a77Teletransportando a todos los jugadores...
teleportationCommencing=\u00a77Comenzando teletransporte... teleportationCommencing=\u00a77Comenzando teletransporte...

View File

@@ -4,7 +4,7 @@
# by: L\u00e9a Gris # by: L\u00e9a Gris
action=* {0} {1} action=* {0} {1}
addedToAccount=\u00a7a{0} a \u00e9t\u00e9 rajout\u00e9 \u00e0 votre compte. addedToAccount=\u00a7a{0} a \u00e9t\u00e9 rajout\u00e9 \u00e0 votre compte.
addedToOthersAccount=\u00a7a{0} has been added to {1} account. New balance: {2} addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
alertBroke=a cass\u00e9 : alertBroke=a cass\u00e9 :
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} \u00e0:{3} alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} \u00e0:{3}
alertPlaced=a plac\u00e9 : alertPlaced=a plac\u00e9 :
@@ -318,7 +318,7 @@ suicideMessage=\u00a77Au revoir monde cruel...
suicideSuccess=\u00a77{0} s''est suicid\u00e9. suicideSuccess=\u00a77{0} s''est suicid\u00e9.
survival=survie survival=survie
takenFromAccount=\u00a7c{0} ont \u00e9t\u00e9 retir\u00e9 de votre compte. takenFromAccount=\u00a7c{0} ont \u00e9t\u00e9 retir\u00e9 de votre compte.
takenFromOthersAccount=\u00a7c{0} has been taken from {1} account. New balance: {2} takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
teleportAAll=\u00a77Demande de t\u00e9l\u00e9portation envoy\u00e9e \u00e0 tous les joueurs... teleportAAll=\u00a77Demande de t\u00e9l\u00e9portation envoy\u00e9e \u00e0 tous les joueurs...
teleportAll=\u00a77T\u00e9l\u00e9poration de tous les joueurs. teleportAll=\u00a77T\u00e9l\u00e9poration de tous les joueurs.
teleportationCommencing=\u00a77D\u00e9but de la t\u00e9l\u00e9portation... teleportationCommencing=\u00a77D\u00e9but de la t\u00e9l\u00e9portation...

View File

@@ -4,7 +4,7 @@
# by: Geertje123 # by: Geertje123
action=* {0} {1} action=* {0} {1}
addedToAccount=\u00a7a{0} is gestort op je account. addedToAccount=\u00a7a{0} is gestort op je account.
addedToOthersAccount=\u00a7a{0} has been added to {1} account. New balance: {2} addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance: {2}
alertBroke=gebroken: alertBroke=gebroken:
alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3} alertFormat=\u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3}
alertPlaced=geplaatst: alertPlaced=geplaatst:
@@ -318,7 +318,7 @@ suicideMessage=\u00a77Vaarwel vreedzame wereld...
suicideSuccess= \u00a77{0} pleegde zelfmoord suicideSuccess= \u00a77{0} pleegde zelfmoord
survival=survival survival=survival
takenFromAccount=\u00a7c{0} is van je bank rekening afgehaald. takenFromAccount=\u00a7c{0} is van je bank rekening afgehaald.
takenFromOthersAccount=\u00a7c{0} has been taken from {1} account. New balance: {2} takenFromOthersAccount=\u00a7c{0} taken from {1}\u00a7c account. New balance: {2}
teleportAAll=\u00a77Teleporting request sent to all players... teleportAAll=\u00a77Teleporting request sent to all players...
teleportAll=\u00a77Bezig met teleporteren van alle spelers... teleportAll=\u00a77Bezig met teleporteren van alle spelers...
teleportationCommencing=\u00a77Aan het beginnen met teleporteren... teleportationCommencing=\u00a77Aan het beginnen met teleporteren...