Commits

Thinkofname authored a25c96eda7e
SPIGOT-742: Throw an exception instead of passing null when the sender cannot be converted
No tags

src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java

Modified
154 154 }
155 155 if (sender instanceof RemoteConsoleCommandSender) {
156 156 return RemoteControlCommandListener.getInstance();
157 157 }
158 158 if (sender instanceof ConsoleCommandSender) {
159 159 return ((CraftServer) sender.getServer()).getServer();
160 160 }
161 161 if (sender instanceof ProxiedCommandSender) {
162 162 return ((ProxiedNativeCommandSender) sender).getHandle();
163 163 }
164 - return null;
164 + throw new IllegalArgumentException("Cannot make " + sender + " a vanilla command listener");
165 165 }
166 166
167 167 private int getPlayerListSize(String as[]) {
168 168 for (int i = 0; i < as.length; i++) {
169 169 if (vanillaCommand.isListStart(as, i) && PlayerSelector.isList(as[i])) {
170 170 return i;
171 171 }
172 172 }
173 173 return -1;
174 174 }

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut