Skip to content

Commit f03979e

Browse files
committed
Fix Block Breaking on Prototype
Also removes some unnecessary imports
1 parent cc1bd19 commit f03979e

5 files changed

Lines changed: 24 additions & 12 deletions

File tree

type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/TypePrototypeLobbyLoader.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99
import net.swofty.proxyapi.redis.ServiceToClient;
1010
import net.swofty.type.generic.HypixelGenericLoader;
1111
import net.swofty.type.generic.HypixelTypeLoader;
12-
import net.swofty.type.generic.SkyBlockTypeLoader;
1312
import net.swofty.type.generic.entity.animalnpc.HypixelAnimalNPC;
1413
import net.swofty.type.generic.entity.npc.HypixelNPC;
1514
import net.swofty.type.generic.entity.villager.HypixelVillagerNPC;
1615
import net.swofty.type.generic.event.HypixelEventClass;
1716
import net.swofty.type.generic.tab.EmptyTabModule;
18-
import net.swofty.type.generic.tab.StandardTabModule;
1917
import net.swofty.type.generic.tab.TablistManager;
2018
import net.swofty.type.generic.tab.TablistModule;
2119
import org.jetbrains.annotations.Nullable;
@@ -30,7 +28,6 @@ public ServerType getType() {
3028

3129
@Override
3230
public void onInitialize(MinecraftServer server) {
33-
3431
}
3532

3633
@Override
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package net.swofty.type.prototypelobby.events;
2+
3+
import net.minestom.server.entity.GameMode;
4+
import net.minestom.server.event.player.PlayerBlockBreakEvent;
5+
import net.swofty.commons.ServerType;
6+
import net.swofty.type.generic.HypixelConst;
7+
import net.swofty.type.generic.event.EventNodes;
8+
import net.swofty.type.generic.event.HypixelEvent;
9+
import net.swofty.type.generic.event.HypixelEventClass;
10+
import net.swofty.type.generic.user.HypixelPlayer;
11+
12+
public class ActionPlayerBlockBreak implements HypixelEventClass {
13+
14+
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
15+
public void onBlockBreak(PlayerBlockBreakEvent event) {
16+
if (HypixelConst.getTypeLoader().getType() != ServerType.PROTOTYPE_LOBBY) return;
17+
18+
HypixelPlayer player = (HypixelPlayer) event.getPlayer();
19+
20+
if (player.getGameMode() == GameMode.CREATIVE) return;
21+
22+
event.setCancelled(true);
23+
}
24+
}

type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPlayerDataSpawn.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
import net.minestom.server.event.player.PlayerSpawnEvent;
44
import net.swofty.type.generic.HypixelConst;
55
import net.swofty.type.generic.HypixelGenericLoader;
6-
import net.swofty.type.generic.data.HypixelDataHandler;
76
import net.swofty.type.generic.event.EventNodes;
87
import net.swofty.type.generic.event.HypixelEvent;
98
import net.swofty.type.generic.event.HypixelEventClass;
109
import net.swofty.type.generic.user.HypixelPlayer;
1110
import net.swofty.type.generic.user.categories.Rank;
1211
import net.swofty.type.prototypelobby.PrototypeLobbyDataHandler;
13-
import org.tinylog.Logger;
1412

1513
public class ActionPlayerDataSpawn implements HypixelEventClass {
1614

type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/events/ActionPrototypeLobbyDataSave.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22

33
import lombok.SneakyThrows;
44
import net.minestom.server.event.player.PlayerDisconnectEvent;
5-
import net.swofty.commons.proxy.ToProxyChannels;
6-
import net.swofty.proxyapi.redis.ServerOutboundMessage;
7-
import net.swofty.type.generic.HypixelConst;
8-
import net.swofty.type.generic.data.HypixelDataHandler;
95
import net.swofty.type.generic.data.mongodb.UserDatabase;
106
import net.swofty.type.generic.event.EventNodes;
117
import net.swofty.type.generic.event.HypixelEvent;
128
import net.swofty.type.generic.event.HypixelEventClass;
139
import net.swofty.type.generic.user.HypixelPlayer;
14-
import net.swofty.type.generic.utility.MathUtility;
1510
import net.swofty.type.prototypelobby.PrototypeLobbyDataHandler;
16-
import org.json.JSONObject;
1711
import org.tinylog.Logger;
1812

1913
import java.util.UUID;

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/packets/client/PacketListenerPlayerDig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import net.swofty.type.generic.packet.HypixelPacketClientListener;
88
import net.swofty.type.generic.user.HypixelPlayer;
99
import net.swofty.type.skyblockgeneric.event.custom.PlayerDamageSkyBlockBlockEvent;
10-
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
1110

1211
public class PacketListenerPlayerDig extends HypixelPacketClientListener {
1312
@Override

0 commit comments

Comments
 (0)