diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandgc.java | 9 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandremove.java | 11 | ||||
| -rw-r--r-- | Essentials/src/messages.properties | 2 | ||||
| -rw-r--r-- | Essentials/src/messages_en.properties | 2 | ||||
| -rw-r--r-- | Essentials/src/plugin.yml | 2 |
5 files changed, 21 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java b/Essentials/src/com/earth2me/essentials/commands/Commandgc.java index f9a04386d..9f15c18fd 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgc.java @@ -6,6 +6,7 @@ import com.earth2me.essentials.utils.NumberUtil; import java.lang.management.ManagementFactory; import java.util.List; import org.bukkit.ChatColor; +import org.bukkit.Chunk; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.command.CommandSender; @@ -55,8 +56,14 @@ public class Commandgc extends EssentialsCommand worldType = "The End"; break; } + + int tileEntities = 0; + + for (Chunk chunk : w.getLoadedChunks()) { + tileEntities += chunk.getTileEntities().length; + } - sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size())); + sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size(), tileEntities)); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java index 9704dd5ee..87f47292c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java @@ -26,7 +26,8 @@ public class Commandremove extends EssentialsCommand MINECARTS, XP, PAINTINGS, - ITEMFRAMES + ITEMFRAMES, + ENDERCRYSTALS } @Override @@ -178,6 +179,14 @@ public class Commandremove extends EssentialsCommand removed++; } } + else if (toRemove == ToRemove.ENDERCRYSTALS) + { + if (e instanceof EnderCrystal) + { + e.remove(); + removed++; + } + } } } sender.sendMessage(_("removed", removed)); diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 3bd30c8bf..d7d4c3b13 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -123,7 +123,7 @@ flying=flying foreverAlone=\u00a74You have nobody to whom you can reply. fullStack=\u00a74You already have a full stack. gameMode=\u00a76Set game mode\u00a7c {0} \u00a76for {1}\u00a76. -gcWorld=\u00a76{0} "\u00a7c{1}\u00a76"\: \u00a7c{2}\u00a76 chunks, \u00a7c{3}\u00a76 entities. +gcWorld=\u00a76{0} "\u00a7c{1}\u00a76"\: \u00a7c{2}\u00a76 chunks, \u00a7c{3}\u00a76 entities, \u00a7c{4}\u00a76 tiles. gcfree=\u00a76Free memory\:\u00a7c {0} MB. gcmax=\u00a76Maximum memory\:\u00a7c {0} MB. gctotal=\u00a76Allocated memory\:\u00a7c {0} MB. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 3bd30c8bf..d7d4c3b13 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -123,7 +123,7 @@ flying=flying foreverAlone=\u00a74You have nobody to whom you can reply. fullStack=\u00a74You already have a full stack. gameMode=\u00a76Set game mode\u00a7c {0} \u00a76for {1}\u00a76. -gcWorld=\u00a76{0} "\u00a7c{1}\u00a76"\: \u00a7c{2}\u00a76 chunks, \u00a7c{3}\u00a76 entities. +gcWorld=\u00a76{0} "\u00a7c{1}\u00a76"\: \u00a7c{2}\u00a76 chunks, \u00a7c{3}\u00a76 entities, \u00a7c{4}\u00a76 tiles. gcfree=\u00a76Free memory\:\u00a7c {0} MB. gcmax=\u00a76Maximum memory\:\u00a7c {0} MB. gctotal=\u00a76Allocated memory\:\u00a7c {0} MB. diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index a57baa5f9..039decadd 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -300,7 +300,7 @@ commands: aliases: [formula,eformula,method,emethod,erecipe,recipes,erecipes] remove: description: Removes entities in your world. - usage: /<command> <drops|arrows|boats|minecarts|xp|paintings> [radius] [world] + usage: /<command> <drops|arrows|boats|minecarts|xp|paintings|itemframes|endercrystals> [radius] [world] aliases: [eremove] repair: description: Repairs the durability of one or all items. |