Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Increment loop index whether or not command succeeded. Fixes BUKKIT-5455

Browse Source 
When VanillaCommandWrapper dispatches a command containing a
PlayerSelector wtih c>-1 (implicitly true for @a), it loops over the
selected players and exectures the command with each player. However, the
loop index is only incremented if the command fails. As a result, a
successful command is repeated on the same player indefinitely, locking up
the server. This commit fixes the issue by incrementing the loop index
regardless of whether the command succeeds, ensuring the command is only
executed once per player identified by the PlayerSelector.
This commit is contained in:
WolfieMario 2014-03-22 13:48:04 -06:00 committed by Nate Mortensen
parent 385ace970e
commit 4873b12890
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
View File

@ -101,7 +101,7 @@ public final class VanillaCommandWrapper extends VanillaCommand {
String s2 = as[i]; String s2 = as[i];
EntityPlayer aentityplayer1[] = aentityplayer; EntityPlayer aentityplayer1[] = aentityplayer;
int k = aentityplayer1.length; int k = aentityplayer1.length;
for (int l = 0; l < k;) { for (int l = 0; l < k;l++) {
EntityPlayer entityplayer = aentityplayer1[l]; EntityPlayer entityplayer = aentityplayer1[l];
as[i] = entityplayer.getName(); as[i] = entityplayer.getName();
try { try {
@ -112,7 +112,6 @@ public final class VanillaCommandWrapper extends VanillaCommand {
ChatMessage chatmessage4 = new ChatMessage(commandexception1.getMessage(), commandexception1.a()); ChatMessage chatmessage4 = new ChatMessage(commandexception1.getMessage(), commandexception1.a());
chatmessage4.getChatModifier().setColor(EnumChatFormat.RED); chatmessage4.getChatModifier().setColor(EnumChatFormat.RED);
icommandlistener.sendMessage(chatmessage4); icommandlistener.sendMessage(chatmessage4);
l++;
} }
} }