nitro/nitro-docker
1
0
Fork 0
mirror of https://github.com/Gurkengewuerz/nitro-docker.git synced 2024-11-22 16:10:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump to newest nitro version

Browse Source
This commit is contained in:
Niklas 2023-10-30 02:06:52 +01:00
parent a814c3aa32
commit 5604514721
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
arcturus/patches/hotfix_badge_perms_delete.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git a/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java b/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java
index e8fca734..86c01371 100644
--- a/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java
@@ -155,4 +155,8 @@ public class PermissionsManager {
public boolean isEffectBlocked(int effectId, int groupId) {
return this.specialEnables.contains(effectId) && this.specialEnables.get(effectId) > groupId;
}
+
+ public Collection<PermissionGroup> getPermissionGroups() {
+ return permissionGroups.values();
+ }
}
diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java
index 56920133..69b5b110 100644
--- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java
+++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java
@@ -13,8 +13,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Comparator;
-import java.util.Set;
@Slf4j
public class BadgesComponent {
@@ -36,9 +36,11 @@ public class BadgesComponent {
while (set.next()) {
HabboBadge badge = new HabboBadge(set, habbo);
- if(!(habbo.getHabboInfo().getPermissionGroup().hasBadge() && habbo.getHabboInfo().getPermissionGroup().getBadge() == badge.getCode())) {
+ Collection<PermissionGroup> permissionGroups = Emulator.getGameEnvironment().getPermissionsManager().getPermissionGroups();
+ for (PermissionGroup permissionGroup : permissionGroups) {
+ if (habbo.getHabboInfo().getPermissionGroup().getId() == permissionGroup.getId()) continue;
+ if (!permissionGroup.hasBadge() || permissionGroup.getBadge() != badge.getCode()) continue;
deleteBadge(habbo.getHabboInfo().getId(), badge.getCode());
- continue;
}
badgesList.add(badge);

2
nitro/Dockerfile
View File

@ -1,7 +1,7 @@
FROM node:lts-alpine as builder
ARG BRANCH=main
ARG COMMIT=ee47e21
ARG COMMIT=1666e35
WORKDIR /build