mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-11-30 01:50:50 +01:00
Merge branch 'fix-remove-rights' into 'dev'
ejectUserFurni on remove room rights See merge request morningstar/Arcturus-Community!491
This commit is contained in:
commit
8d525ff60b
@ -3962,7 +3962,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
|
||||
return;
|
||||
|
||||
this.sendComposer(new RoomRemoveRightsListComposer(this, userId).compose());
|
||||
|
||||
|
||||
if (this.rights.remove(userId)) {
|
||||
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM room_rights WHERE room_id = ? AND user_id = ?")) {
|
||||
statement.setInt(1, this.id);
|
||||
@ -3974,6 +3974,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
|
||||
}
|
||||
|
||||
if (habbo != null) {
|
||||
this.ejectUserFurni(habbo.getHabboInfo().getId());
|
||||
habbo.getRoomUnit().setRightsLevel(RoomRightLevels.NONE);
|
||||
habbo.getRoomUnit().removeStatus(RoomUnitStatus.FLAT_CONTROL);
|
||||
this.refreshRightsForHabbo(habbo);
|
||||
@ -3981,6 +3982,10 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
|
||||
}
|
||||
|
||||
public void removeAllRights() {
|
||||
for (int userId : rights.toArray()) {
|
||||
this.ejectUserFurni(userId);
|
||||
}
|
||||
|
||||
this.rights.clear();
|
||||
|
||||
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM room_rights WHERE room_id = ?")) {
|
||||
|
Loading…
Reference in New Issue
Block a user