mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-26 16:04:27 +02:00
Readlocks maybe...
This commit is contained in:
@@ -33,6 +33,7 @@ public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.setti
|
||||
@Override
|
||||
public Kit getKit(String kitName) throws Exception
|
||||
{
|
||||
Kit kit;
|
||||
acquireReadLock();
|
||||
try
|
||||
{
|
||||
@@ -41,18 +42,18 @@ public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.setti
|
||||
{
|
||||
throw new Exception(_("kitError2"));
|
||||
}
|
||||
Kit kit = getData().getKits().get(kitName.toLowerCase(Locale.ENGLISH));
|
||||
kit = getData().getKits().get(kitName.toLowerCase(Locale.ENGLISH));
|
||||
if (kit == null)
|
||||
{
|
||||
throw new Exception(_("kitError2"));
|
||||
}
|
||||
return kit;
|
||||
|
||||
}
|
||||
finally
|
||||
{
|
||||
unlock();
|
||||
}
|
||||
|
||||
}
|
||||
return kit;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -45,7 +45,8 @@ public class Commandeco extends EssentialsCommand
|
||||
break;
|
||||
|
||||
case RESET:
|
||||
@Cleanup ISettings settings = ess.getSettings();
|
||||
@Cleanup
|
||||
ISettings settings = ess.getSettings();
|
||||
settings.acquireReadLock();
|
||||
player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount);
|
||||
break;
|
||||
|
@@ -676,7 +676,10 @@ public class User extends UserBase implements IUser
|
||||
final Map<Integer, ItemStack> overfilled;
|
||||
if (isAuthorized("essentials.oversizedstacks"))
|
||||
{
|
||||
int oversizedStackSize = ess.getSettings().getData().getGeneral().getOversizedStacksize();
|
||||
@Cleanup
|
||||
final ISettings settings = ess.getSettings();
|
||||
settings.acquireReadLock();
|
||||
int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize();
|
||||
|
||||
overfilled = InventoryWorkaround.addItem(getInventory(), true, oversizedStackSize, itemStack);
|
||||
}
|
||||
|
Reference in New Issue
Block a user