JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PC-1702

This commit is contained in:
Sam 2017-10-21 20:32:59 +01:00 committed by Alexander Meech
parent eb936662f1
commit 807d977434
3 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
View File

@ -45,17 +45,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.common.DummyEntity;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.event.CustomTagEvent;
import mineplex.core.packethandler.IPacketHandler;
import mineplex.core.packethandler.PacketHandler;
import mineplex.core.packethandler.PacketInfo;
import mineplex.core.packethandler.PacketVerifier;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
public class CustomTagFix extends MiniPlugin implements IPacketHandler public class CustomTagFix extends MiniPlugin implements IPacketHandler
{ {
private Map<UUID, Map<Integer, Integer[]>> _entityMap = new HashMap<>(); private Map<UUID, Map<Integer, Integer[]>> _entityMap = new HashMap<>();

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
View File

@ -174,7 +174,8 @@ public abstract class Kit implements Listener
} }
entity.setRemoveWhenFarAway(false); entity.setRemoveWhenFarAway(false);
entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit"); // Intercepted in LobbyManager
entity.setCustomName("");
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
entity.getEquipment().setItemInHand(_itemInHand); entity.getEquipment().setItemInHand(_itemInHand);

41
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/LobbyManager.java
View File

@ -3,6 +3,9 @@ package nautilus.game.arcade.managers.lobby;
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;
import net.minecraft.server.v1_8_R3.DataWatcher.WatchableObject;
import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Color; import org.bukkit.Color;
@ -37,11 +40,14 @@ import mineplex.core.common.util.UtilBlockText;
import mineplex.core.common.util.UtilBlockText.TextAlign; import mineplex.core.common.util.UtilBlockText.TextAlign;
import mineplex.core.common.util.UtilFirework; import mineplex.core.common.util.UtilFirework;
import mineplex.core.common.util.UtilLambda; import mineplex.core.common.util.UtilLambda;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilWorld; import mineplex.core.common.util.UtilWorld;
import mineplex.core.donation.Donor; import mineplex.core.donation.Donor;
import mineplex.core.event.CustomTagEvent; import mineplex.core.event.CustomTagEvent;
import mineplex.core.packethandler.IPacketHandler;
import mineplex.core.packethandler.PacketInfo;
import mineplex.core.scoreboard.MineplexScoreboard; import mineplex.core.scoreboard.MineplexScoreboard;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
@ -59,7 +65,7 @@ import nautilus.game.arcade.managers.LobbyEnt;
/** /**
* *
*/ */
public abstract class LobbyManager implements Listener public abstract class LobbyManager implements Listener, IPacketHandler
{ {
protected static final World WORLD = Bukkit.getWorld("world"); protected static final World WORLD = Bukkit.getWorld("world");
@ -126,6 +132,8 @@ public abstract class LobbyManager implements Listener
manager.getPluginManager().registerEvents(this, manager.getPlugin()); manager.getPluginManager().registerEvents(this, manager.getPlugin());
System.out.println("Using " + getClass().getSimpleName() + " as the lobby manager"); System.out.println("Using " + getClass().getSimpleName() + " as the lobby manager");
manager.getPacketHandler().addPacketHandler(this, PacketPlayOutEntityMetadata.class);
} }
public abstract void createTeams(Game game); public abstract void createTeams(Game game);
@ -559,6 +567,37 @@ public abstract class LobbyManager implements Listener
return entityName; return entityName;
} }
@Override
public void handle(PacketInfo packetInfo)
{
// Only need to handle this for 1.9+
if (!UtilPlayer.is1_9(packetInfo.getPlayer()))
{
return;
}
PacketPlayOutEntityMetadata packet = (PacketPlayOutEntityMetadata) packetInfo.getPacket();
for (LobbyEnt ent : _kits.values())
{
if (ent.GetEnt().getEntityId() == packet.a)
{
String customName = GetKitCustomName(packetInfo.getPlayer(), _manager.GetGame(), ent);
System.out.println(packetInfo.getPlayer().getName() + " -> " + customName);
for (WatchableObject watchableObject : packet.b)
{
if (watchableObject.getIndex().equals(net.minecraft.server.v1_8_R3.Entity.META_CUSTOMNAME))
{
watchableObject.a(customName, customName);
}
}
return;
}
}
}
@EventHandler @EventHandler
public void customEntityName(CustomTagEvent event) public void customEntityName(CustomTagEvent event)
{ {