Skip to content

Revert "Fix StealthSnatch sendCollected Method" #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2023
Merged

Revert "Fix StealthSnatch sendCollected Method" #421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/main/java/com/volmit/adapt/content/adaptation/stealth/StealthSnatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
import com.volmit.adapt.api.adaptation.SimpleAdaptation;
import com.volmit.adapt.util.*;
import lombok.NoArgsConstructor;
import net.minecraft.network.protocol.game.PacketPlayOutCollect;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -118,9 +116,20 @@ private double getRange(double factor) {

public void sendCollected(Player plr, Item item) {
try {
PacketPlayOutCollect packet = new PacketPlayOutCollect(item.getEntityId(), plr.getEntityId(), item.getItemStack().getAmount());
for (Entity i : plr.getWorld().getNearbyEntities(plr.getLocation(), 8, 8, 8, entity -> entity instanceof Player player)) {
((CraftPlayer) i).getHandle().b.a(packet);
String nmstag = Bukkit.getServer().getClass().getCanonicalName().split("\\Q.\\E")[3];
Class<?> c = Class.forName("net.minecraft.server." + nmstag + ".PacketPlayOutCollect");
Class<?> p = Class.forName("net.minecraft.server." + nmstag + ".EntityPlayer");
Class<?> pk = Class.forName("net.minecraft.server." + nmstag + ".Packet");
Object v = c.getConstructor().newInstance();
new V(v).set("a", item.getEntityId());
new V(v).set("b", plr.getEntityId());
new V(v).set("c", item.getItemStack().getAmount());

for (Entity i : plr.getWorld().getNearbyEntities(plr.getLocation(), 8, 8, 8)) {
if (i instanceof Player) {
Object pconnect = new V(new V(i).invoke("getHandle")).get("playerConnection");
pconnect.getClass().getMethod("sendPacket", pk).invoke(pconnect, v);
}
}
} catch (Exception e) {
Adapt.error("Failed to send collected packet");
Expand Down