TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-08 21:43:11 +00:00
Code Issues Projects Releases Wiki Activity

pw

Browse source
This commit is contained in:
boy0001 2015-02-20 19:55:04 +11:00
parent 0dc0b29ea7
commit 439a1d440a
29 changed files with 60 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View file

@ -142,7 +142,7 @@ public class Merge extends SubCommand {
return false;
}
}
final PlotWorld plotWorld = PlotSquared.getWorldSettings(world);
final PlotWorld plotWorld = PlotSquared.getPlotWorld(world);
if (PlotSquared.useEconomy && plotWorld.USE_ECONOMY) {
double cost = plotWorld.MERGE_PRICE;
cost = plots.size() * cost;