Skip to content

Fix NPE in setHeldItemSlot and clarify empty catches in SimpleServiceManager #13711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ak-dude wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −6
Open

Fix NPE in setHeldItemSlot and clarify empty catches in SimpleServiceManager #13711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions paper-api/src/main/java/org/bukkit/plugin/SimpleServicesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ public void unregisterAll(@NotNull Plugin plugin) {
it.remove();
}
}
} catch (NoSuchElementException e) {}
} catch (NoSuchElementException e) {
// Outer HashMap iterator can throw after inner list removals invalidate its state
}
}
for (ServiceUnregisterEvent event : unregisteredEvents) {
Bukkit.getServer().getPluginManager().callEvent(event);
Expand Down Expand Up @@ -135,15 +137,18 @@ public void unregister(@NotNull Class<?> service, @NotNull Object provider) {
unregisteredEvents.add(new ServiceUnregisterEvent(registered));
}
}
} catch (NoSuchElementException e) { // Why does Java suck
} catch (NoSuchElementException e) {
// it2.remove() can corrupt the inner iterator's state on some list implementations
}

// Get rid of the empty list
if (entry.getValue().size() == 0) {
it.remove();
}
}
} catch (NoSuchElementException e) {}
} catch (NoSuchElementException e) {
// Outer HashMap iterator can throw after inner list removals invalidate its state
}
}
for (ServiceUnregisterEvent event : unregisteredEvents) {
Bukkit.getServer().getPluginManager().callEvent(event);
Expand Down Expand Up @@ -177,15 +182,18 @@ public void unregister(@NotNull Object provider) {
unregisteredEvents.add(new ServiceUnregisterEvent(registered));
}
}
} catch (NoSuchElementException e) { // Why does Java suck
} catch (NoSuchElementException e) {
// it2.remove() can corrupt the inner iterator's state on some list implementations
}

// Get rid of the empty list
if (entry.getValue().size() == 0) {
it.remove();
}
}
} catch (NoSuchElementException e) {}
} catch (NoSuchElementException e) {
// Outer HashMap iterator can throw after inner list removals invalidate its state
}
}
for (ServiceUnregisterEvent event : unregisteredEvents) {
Bukkit.getServer().getPluginManager().callEvent(event);
Expand Down
7 changes: 6 additions & 1 deletion paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,12 @@ public int getHeldItemSlot() {
public void setHeldItemSlot(int slot) {
Preconditions.checkArgument(slot >= 0 && slot < Inventory.getSelectionSize(), "Slot (%s) is not between 0 and %s inclusive", slot, Inventory.getSelectionSize() - 1);
this.getInventory().setSelectedSlot(slot);
((CraftPlayer) this.getHolder()).getHandle().connection.send(new ClientboundSetHeldSlotPacket(slot));
// Paper start - Fix NPE when setHeldItemSlot is called on a disconnecting player
if (this.getHolder() == null) return;
ServerPlayer player = ((CraftPlayer) this.getHolder()).getHandle();
if (player.connection == null) return;
// Paper end - Fix NPE when setHeldItemSlot is called on a disconnecting player
player.connection.send(new ClientboundSetHeldSlotPacket(slot));
}

@Override
Expand Down