From 1a7d652154faa85288fff3188cf12b8ca4e42d98 Mon Sep 17 00:00:00 2001
From: Saturn5Vfive <luke.inventor@gmail.com>
Date: Tue, 19 Apr 2022 17:01:00 -0500
Subject: [PATCH] crubge'
---
.../net/shadow/client/feature/command/impl/ServerCrash.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/java/net/shadow/client/feature/command/impl/ServerCrash.java b/src/main/java/net/shadow/client/feature/command/impl/ServerCrash.java
index 06695f3..60ed5bc 100644
--- a/src/main/java/net/shadow/client/feature/command/impl/ServerCrash.java
+++ b/src/main/java/net/shadow/client/feature/command/impl/ServerCrash.java
@@ -153,7 +153,6 @@ public class ServerCrash extends Command {
Notification.create(2000, "Server Crash", Notification.Type.SUCCESS, "Sent Quick Lag Crash");
}
-<<<<<<< HEAD
case "lag2" -> {
for(int i = 0; i < 255; i++){
client.player.networkHandler.sendPacket(new RequestCommandCompletionsC2SPacket(0, "/"));
@@ -161,8 +160,6 @@ public class ServerCrash extends Command {
Notification.create(2000, "Server Crash", Notification.Type.SUCCESS, "Sent Quick Lag Crash");
}
-=======
->>>>>>> 08546d61283129fdfeb469a104f2baacfa6d05fe
case "maptool" -> {
int size = new IntegerArgumentParser().parse(args[1]);
client.player.sendChatMessage("/maptool new https://cdn.discordapp.com/attachments/956657243812675595/963652761172455454/unknown.png resize " + size + " " + size + "");