From 80d4942fe34cf4f51723a6bd7828ae87a2e0295b Mon Sep 17 00:00:00 2001
From: SerendipityR <48401197+SerendipityR-2022@users.noreply.github.com>
Date: Sun, 1 Jan 2023 09:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E8=AF=86?=
=?UTF-8?q?=E5=88=AB=E4=BE=9D=E8=B5=96=E5=BA=93=E5=AF=BC=E8=87=B4=E7=9A=84?=
=?UTF-8?q?=E5=86=B2=E7=AA=81=EF=BC=8C=E4=BD=BF=E9=A1=B9=E7=9B=AE=E8=83=BD?=
=?UTF-8?q?=E5=A4=9F=E7=9B=B4=E6=8E=A5=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
EndMinecraftPlusV2.iml | 85 ++++++++++++++++++-
VersionSupport-578/VersionSupport-578.iml | 18 ++++
VersionSupport-754/VersionSupport-754.iml | 19 ++++-
VersionSupport-758/VersionSupport-758.iml | 19 ++++-
VersionSupport-759/VersionSupport-759.iml | 19 ++++-
VersionSupport-760/VersionSupport-760.iml | 19 ++++-
VersionSupport-760/src/META-INF/MANIFEST.MF | 3 +
.../OldVersion/AttackUtils/BotAttack.java | 15 ++--
8 files changed, 184 insertions(+), 13 deletions(-)
create mode 100644 VersionSupport-760/src/META-INF/MANIFEST.MF
diff --git a/EndMinecraftPlusV2.iml b/EndMinecraftPlusV2.iml
index 061c06f..44e2880 100644
--- a/EndMinecraftPlusV2.iml
+++ b/EndMinecraftPlusV2.iml
@@ -7,14 +7,91 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VersionSupport-578/VersionSupport-578.iml b/VersionSupport-578/VersionSupport-578.iml
index ece4b54..8bfd4db 100644
--- a/VersionSupport-578/VersionSupport-578.iml
+++ b/VersionSupport-578/VersionSupport-578.iml
@@ -16,5 +16,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VersionSupport-754/VersionSupport-754.iml b/VersionSupport-754/VersionSupport-754.iml
index d9fc988..75df7c1 100644
--- a/VersionSupport-754/VersionSupport-754.iml
+++ b/VersionSupport-754/VersionSupport-754.iml
@@ -16,6 +16,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VersionSupport-758/VersionSupport-758.iml b/VersionSupport-758/VersionSupport-758.iml
index 4deac39..e16b257 100644
--- a/VersionSupport-758/VersionSupport-758.iml
+++ b/VersionSupport-758/VersionSupport-758.iml
@@ -16,6 +16,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VersionSupport-759/VersionSupport-759.iml b/VersionSupport-759/VersionSupport-759.iml
index f26e6f0..5049a2f 100644
--- a/VersionSupport-759/VersionSupport-759.iml
+++ b/VersionSupport-759/VersionSupport-759.iml
@@ -7,7 +7,6 @@
-
@@ -18,5 +17,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VersionSupport-760/VersionSupport-760.iml b/VersionSupport-760/VersionSupport-760.iml
index e76837a..95b0bc6 100644
--- a/VersionSupport-760/VersionSupport-760.iml
+++ b/VersionSupport-760/VersionSupport-760.iml
@@ -16,6 +16,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VersionSupport-760/src/META-INF/MANIFEST.MF b/VersionSupport-760/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..8001206
--- /dev/null
+++ b/VersionSupport-760/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: cn.serendipityr.EndMinecraftPlusV2.EndMinecraftPlusV2
+
diff --git a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/OldVersion/AttackUtils/BotAttack.java b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/OldVersion/AttackUtils/BotAttack.java
index 503e04f..16c3bd7 100644
--- a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/OldVersion/AttackUtils/BotAttack.java
+++ b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/OldVersion/AttackUtils/BotAttack.java
@@ -10,15 +10,15 @@ import cn.serendipityr.EndMinecraftPlusV2.VersionControl.OldVersion.ForgeProtoco
import io.netty.util.internal.ConcurrentSet;
import org.spacehq.mc.protocol.MinecraftProtocol;
import org.spacehq.mc.protocol.data.game.ItemStack;
+import org.spacehq.mc.protocol.data.game.values.ClientRequest;
import org.spacehq.mc.protocol.data.message.Message;
import org.spacehq.mc.protocol.packet.ingame.client.ClientChatPacket;
import org.spacehq.mc.protocol.packet.ingame.client.ClientPluginMessagePacket;
+import org.spacehq.mc.protocol.packet.ingame.client.ClientRequestPacket;
import org.spacehq.mc.protocol.packet.ingame.client.player.ClientPlayerMovementPacket;
-import org.spacehq.mc.protocol.packet.ingame.server.ServerChatPacket;
-import org.spacehq.mc.protocol.packet.ingame.server.ServerJoinGamePacket;
-import org.spacehq.mc.protocol.packet.ingame.server.ServerKeepAlivePacket;
-import org.spacehq.mc.protocol.packet.ingame.server.ServerPluginMessagePacket;
+import org.spacehq.mc.protocol.packet.ingame.server.*;
import org.spacehq.mc.protocol.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket;
+import org.spacehq.mc.protocol.packet.ingame.server.entity.player.ServerUpdateHealthPacket;
import org.spacehq.opennbt.NBTIO;
import org.spacehq.opennbt.tag.builtin.CompoundTag;
import org.spacehq.opennbt.tag.builtin.ListTag;
@@ -492,7 +492,6 @@ public class BotAttack extends IAttack {
positionPacket.put(session, packet);
}
} catch (Exception ignored) {}
-
} else if (recvPacket instanceof ServerChatPacket) {
ServerChatPacket chatPacket = (ServerChatPacket) recvPacket;
Message message = chatPacket.getMessage();
@@ -516,6 +515,12 @@ public class BotAttack extends IAttack {
if (!alivePlayers.contains(session)) {
alivePlayers.add(session);
}
+ } else if (recvPacket instanceof ServerUpdateHealthPacket) {
+ if (((ServerUpdateHealthPacket) recvPacket).getHealth() <= 0) {
+ ClientRequestPacket clientRequestPacket = new ClientRequestPacket(ClientRequest.RESPAWN);
+
+ session.send(clientRequestPacket);
+ }
}
}