Skip to content
This repository was archived by the owner on Aug 9, 2021. It is now read-only.

Commit 8a0bab5

Browse files
committed
Merge branch 'release/1.1HotFix1'
2 parents b83d7cc + 64ff088 commit 8a0bab5

File tree

4 files changed

+36
-22
lines changed

4 files changed

+36
-22
lines changed

src/main/java/eu/quantumsociety/deltacraft/commands/home/DelHomeCommand.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,14 @@ class DelHomeCommand(private val homeConfigManager: HomesManager) : CommandExecu
6767
// first argument autocomplete
6868
if (cmd.name.equals("delhome", true) && p3.isNotEmpty() && p3.size < 2) {
6969

70-
71-
72-
if (homeConfigManager.homeExists(player, "default")) {
73-
list.add("default")
74-
}
70+
val typedIn = p3[0].toLowerCase()
7571

7672
val homes = homeConfigManager.getPlayerHomes(player)
7773

7874
for (h in homes) {
79-
list.add(h.homeName)
75+
if (h.homeName.startsWith(typedIn)) {
76+
list.add(h.homeName)
77+
}
8078
}
8179
}
8280

src/main/java/eu/quantumsociety/deltacraft/commands/home/HomeCommand.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@ class HomeCommand(private val configManager: HomesManager) : CommandExecutor, Ta
129129

130130
if (cmd.name.equals("home", true) && p3.isNotEmpty() && p3.size < 2) {
131131

132-
133-
if (configManager.homeExists(player, "default")) {
134-
list.add("default")
135-
}
136-
132+
val typedIn = p3[0].toLowerCase()
137133

138134
val homes = configManager.getPlayerHomes(player)
139135

140136
for (h in homes) {
141-
list.add(h.homeName)
137+
if (h.homeName.startsWith(typedIn)) {
138+
list.add(h.homeName)
139+
}
142140
}
143141
}
144142

143+
144+
145145
return list
146146
}
147147
}

src/main/java/eu/quantumsociety/deltacraft/commands/kelp/KelpCommand.java

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -371,27 +371,43 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comman
371371
return list;
372372
}
373373

374-
if (args.length < 1 || args[0].isEmpty() || args[0].length() < 3) {
375-
list.add("set");
376-
// list.add("age");
377-
list.add("test");
378-
list.add("create");
379-
list.add("remove");
374+
if (args.length < 2 || args[0].isEmpty()) {
375+
String typedIn = "";
376+
if (args.length == 1) {
377+
typedIn = args[0].toLowerCase();
378+
}
379+
String[] cmds = {"set", "test", "create", "remove"};
380+
381+
for (String cmd : cmds) {
382+
if (cmd.startsWith(typedIn)) {
383+
list.add(cmd);
384+
}
385+
}
380386
return list;
381387
}
382388

383-
String first = args[0];
389+
String first = args[0].toLowerCase();
384390

385-
switch (first.toLowerCase()) {
391+
switch (first) {
386392
case "set":
387393
list.add("1");
388394
list.add("2");
389395
break;
390396
case "remove":
397+
String typedIn = "";
398+
if (args.length > 1) {
399+
typedIn = args[1].toLowerCase();
400+
}
401+
391402
Player p = (Player) sender;
392403
UUID id = p.getUniqueId();
393404

394-
list = this.getMgr().getKelpFarmNames(id);
405+
List<String> names = this.getMgr().getKelpFarmNames(id);
406+
for (String name : names) {
407+
if (name.toLowerCase().startsWith(typedIn)) {
408+
list.add(name);
409+
}
410+
}
395411
break;
396412
}
397413

src/main/java/eu/quantumsociety/deltacraft/listeners/SpectateListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class SpectateListener(private val plugin: DeltaCraft) : Listener {
8888
val spectatePlayers = this.spectateCacheManager.values
8989

9090
for (sp in spectatePlayers) {
91-
if (sp != null) {
91+
if (sp != null && sp.player != null && sp.player.isOnline) {
9292
this.fakePlayerManager.spawnFakePlayer(sp.player, observer, sp.originalLocation)
9393
}
9494
}

0 commit comments

Comments
 (0)