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

Revert "Changes for 1.13 compatibility"

Browse Source 
This reverts commit 201c285091.
This commit is contained in:
AlexTheCoder 2018-06-14 01:36:54 -04:00
parent c72f6c00a7
commit 6fb86c264d
8 changed files with 74 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/MultiBlockUpdaterAgent.java
View File

@ -37,26 +37,24 @@ public class MultiBlockUpdaterAgent
/**
* Add a block to the list of blocks to send to the player. The agent supports blocks across different chunks and
* will not send duplicates.
*
* @param block The block to send. The block is stored using a BlockVector, meaning that when the send method is called, it will use
* the material and data found for the block at the moment you call the send method.
* the material and data found for the block at the moment you call the send method.
* @see #send(Collection)
*/
public void addBlock(Block block)
{
Chunk c = ((CraftChunk) block.getChunk()).getHandle();
List<BlockVector> list = _chunks.computeIfAbsent(c, chunk -> new ArrayList<>());
Chunk c = ((CraftChunk)block.getChunk()).getHandle();
List<BlockVector> list = _chunks.computeIfAbsent(c,chunk -> new ArrayList<>());
if (list.size() >= 64) return;
if(list.size() >= 64) return;
BlockVector bv = block.getLocation().toVector().toBlockVector();
if (list.contains(bv)) return;
if(list.contains(bv)) return;
list.add(bv);
}
/**
* Sends all the record blocks to all online players. Players out of range will not receive packets.
*
* @see #send(Collection)
*/
public void send()
@ -75,55 +73,54 @@ public class MultiBlockUpdaterAgent
/**
* Send all the recorded blocks to the provided players. This will only send packets to players in range. If the blocks span multiple
* chunks then players will only receive block updates for chunks close to them.
*
* @param players The players which will the packets will be sent to.
*/
public void send(Collection<? extends Player> players)
{
for (Player p : players)
for(Player p : players)
{
for (Chunk c : _chunks.keySet())
for(Chunk c : _chunks.keySet())
{
if (!p.getWorld().equals(c.bukkitChunk.getWorld())) continue;
if(!p.getWorld().equals(c.bukkitChunk.getWorld())) continue;
int x = p.getLocation().getChunk().getX();
int z = p.getLocation().getChunk().getZ();
int chunkDist = Math.max(Math.abs(c.locX - x), Math.abs(c.locZ - z));
int chunkDist = Math.max(Math.abs(c.locX-x), Math.abs(c.locZ-z));
if (chunkDist > Bukkit.getViewDistance()) continue;
if(chunkDist > Bukkit.getViewDistance()) continue;
sendPacket(c, p);
}
}
}
private void sendPacket(Chunk c, Player... players)
private void sendPacket(Chunk c, Player...players)
{
List<BlockVector> list = _chunks.get(c);
if (list == null) return;
if(list == null) return;
if (list.size() >= 64)
if(list.size() >= 64)
{
for (Player p : players)
for(Player p : players)
{
int protocol = ((CraftPlayer) p).getHandle().getProtocol();
UtilPlayer.sendPacket(p, new PacketPlayOutMapChunk(protocol, c, true, 65535));
UtilPlayer.sendPacket(p, new PacketPlayOutMapChunk(c, true, 65535));
}
} else
}
else
{
PacketPlayOutMultiBlockChange packet = new PacketPlayOutMultiBlockChange();
packet.a = new ChunkCoordIntPair(c.locX, c.locZ);
packet.b = new MultiBlockChangeInfo[list.size()];
for (int i = 0; i < list.size(); i++)
for(int i = 0; i < list.size(); i++)
{
BlockVector bv = list.get(i);
short xyz = (short) ((bv.getBlockX() & 0xF) << 12 | (bv.getBlockZ() & 0xF) << 8 | bv.getBlockY());
short xyz = (short)((bv.getBlockX() & 0xF) << 12 | (bv.getBlockZ() & 0xF) << 8 | bv.getBlockY());
packet.b[i] = packet.new MultiBlockChangeInfo(xyz, c);
}
for (Player p : players)
for(Player p : players)
{
UtilPlayer.sendPacket(p, packet);
}
@ -131,21 +128,22 @@ public class MultiBlockUpdaterAgent
Packet<?>[] tileEntities = new Packet[c.tileEntities.size()];
int i = 0;
for (TileEntity te : c.tileEntities.values())
for(TileEntity te : c.tileEntities.values())
{
tileEntities[i++] = te.getUpdatePacket();
}
for (Player p : players)
for(Player p : players)
{
UtilPlayer.sendPacket(p, tileEntities);
((WorldServer) c.world).getTracker().untrackPlayer(((CraftPlayer) p).getHandle());
((WorldServer)c.world).getTracker().untrackPlayer(((CraftPlayer)p).getHandle());
}
Bukkit.getScheduler().runTaskLater(UtilServer.getPlugin(), () ->
{
for (Player p : players)
for(Player p : players)
{
((WorldServer) c.world).getTracker().a(((CraftPlayer) p).getHandle(), c);
((WorldServer)c.world).getTracker().a(((CraftPlayer)p).getHandle(), c);
}
}, 5);
}
}

3
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/LineFormat.java
View File

@ -4,8 +4,7 @@ public enum LineFormat
{
LORE(220),
PUNISHMENT_UI(48),
CHAT(319),
SCOREBOARD(16);
CHAT(319);
private int _length;

23
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
View File

@ -1,10 +1,7 @@
package mineplex.core.common.util;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import net.minecraft.server.v1_8_R3.EnumParticle;
import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
@ -175,16 +172,6 @@ public class UtilParticle
WATER_WAKE(EnumParticle.WATER_WAKE, "wake");
private static final Map<String, ParticleType> byName = new ConcurrentHashMap<>();
static
{
for (ParticleType type : values())
{
byName.put(type.particleName, type);
}
}
public EnumParticle particle;
public String particleName;
private boolean _friendlyData;
@ -261,7 +248,15 @@ public class UtilParticle
details[i] = Integer.parseInt(parts[i + 1]);
}
ParticleType particleType = ParticleType.byName.getOrDefault(parts[0], ParticleType.CRIT);
ParticleType particleType = ParticleType.CRIT;
for (ParticleType type : ParticleType.values())
{
if (type.particleName.equalsIgnoreCase(parts[0]))
{
particleType = type;
}
}
return new PacketPlayOutWorldParticles(particleType.particle, displayFar,
(float) location.getX(), (float) location.getY(), (float) location.getZ(), offsetX, offsetY, offsetZ, speed,

16
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
View File

@ -554,7 +554,7 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
if (pDisguise.getSleepingDirection() != null)
{
for (Packet packet : getBedPackets(protocol, pDisguise))
for (Packet packet : getBedPackets(pDisguise))
{
handlePacket(packet, packetVerifier);
}
@ -821,15 +821,14 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
{
List<Packet> packets = new ArrayList<>();
EntityPlayer nmsPlayer = ((CraftPlayer) player).getHandle();
final int protocol = nmsPlayer.getProtocol();
PacketPlayOutMapChunk chunk = new PacketPlayOutMapChunk(protocol, _bedChunk, true, '\uffff');
PacketPlayOutMapChunk chunk = new PacketPlayOutMapChunk(_bedChunk, true, '\uffff');
chunk.a = BED_POS_NORTH[0] >> 4;
chunk.b = BED_POS_NORTH[2] >> 4;
packets.add(chunk);
EntityPlayer nmsPlayer = ((CraftPlayer) player).getHandle();
_spawnPacketMap.entrySet().stream()
.filter(entry -> entry.getValue().size() > 0 && entry.getValue().getFirst() instanceof DisguisePlayer && ((DisguisePlayer) entry.getValue().getFirst()).getSleepingDirection() != null)
.filter(entry -> this.containsSpawnDisguise(player, entry.getValue().getFirst()))
@ -839,7 +838,7 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
if (tracker != null && tracker.trackedPlayers.contains(nmsPlayer))
{
packets.addAll(getBedPackets(protocol, (DisguisePlayer) entry.getValue().getFirst()));
packets.addAll(getBedPackets((DisguisePlayer) entry.getValue().getFirst()));
}
});
@ -854,7 +853,7 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
*
* fixme can we make this better at all?!?!?!
*/
private List<Packet> getBedPackets(int protocol, DisguisePlayer playerDisguise)
private List<Packet> getBedPackets(DisguisePlayer playerDisguise)
{
int[] coords = getCoordsFor(playerDisguise);
@ -874,7 +873,8 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
double d1 = posY + (targetY - posY) / (double) partitions;
double d2 = posZ + (targetZ - posZ) / (double) partitions;
PacketPlayOutMapChunk chunk = new PacketPlayOutMapChunk(protocol, _bedChunk, true, '\uffff');
PacketPlayOutMapChunk chunk = new PacketPlayOutMapChunk(_bedChunk, true, '\uffff');
chunk.a = (int) Math.floor(d0) >> 4;
chunk.b = (int) Math.floor(d2) >> 4;
packets.add(chunk);

28
Plugins/Mineplex.Hub/src/mineplex/hub/HubClient.java
View File

@ -1,15 +1,12 @@
package mineplex.hub;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
public class HubClient
{
private static final int DISPLAY_LENGTH = 16;
private String _display;
private int _index;
private String ScoreboardString;
private int ScoreboardIndex ;
public HubClient(String name)
{
@ -18,29 +15,26 @@ public class HubClient
public void setName(String name)
{
//_display = " Welcome " + name + ", to the Mineplex Network!";
//_index = 0;
_display = UtilText.center(C.cGoldB + "MINE" + C.cYellowB + "PLEX", LineFormat.SCOREBOARD);
ScoreboardString = " Welcome " + name + ", to the Mineplex Network!";
ScoreboardIndex = 0;
}
public String GetScoreboardText()
{
/* if (_display.length() <= DISPLAY_LENGTH)
if (ScoreboardString.length() <= DISPLAY_LENGTH)
{
return _display;
return ScoreboardString;
}
String display = _display.substring(_index, Math.min(_index + DISPLAY_LENGTH, _display.length()));
String display = ScoreboardString.substring(ScoreboardIndex, Math.min(ScoreboardIndex + DISPLAY_LENGTH, ScoreboardString.length()));
if (display.length() < DISPLAY_LENGTH)
{
int add = DISPLAY_LENGTH - display.length();
display += _display.substring(0, add);
display += ScoreboardString.substring(0, add);
}
_index = (_index + 1) % _display.length();
return display; */
return _display;
ScoreboardIndex = (ScoreboardIndex + 1) % ScoreboardString.length();
return display;
}
}

4
Plugins/Mineplex.Hub/src/mineplex/hub/scoreboard/HubScoreboard.java
View File

@ -47,9 +47,7 @@ public class HubScoreboard extends ScoreboardManager
}
}
scoreboard
.register(HubScoreboardLine.START_EMPTY_SPACER)
.register(HubScoreboardLine.SERVER_TITLE)
scoreboard.register(HubScoreboardLine.SERVER_TITLE)
.register(HubScoreboardLine.SERVER_NAME)
.register(HubScoreboardLine.SERVER_EMPTY_SPACER)
.register(HubScoreboardLine.GEM_TITLE)

1
Plugins/Mineplex.Hub/src/mineplex/hub/scoreboard/HubScoreboardLine.java
View File

@ -4,7 +4,6 @@ import mineplex.core.scoreboard.ScoreboardLine;
public enum HubScoreboardLine implements ScoreboardLine
{
START_EMPTY_SPACER,
SERVER_TITLE,
SERVER_NAME,
SERVER_EMPTY_SPACER,

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Crumbleable.java
View File

@ -15,7 +15,6 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_8_R3.CraftChunk;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import mineplex.core.common.util.MapUtil;
@ -154,8 +153,7 @@ public abstract class Crumbleable
for (Player player : UtilServer.getPlayers())
{
int protocol = ((CraftPlayer) player).getHandle().getProtocol();
UtilPlayer.sendPacket(player, new PacketPlayOutMapChunk(protocol, chunk, false, mask));
UtilPlayer.sendPacket(player, new PacketPlayOutMapChunk(chunk, false, mask));
}
_lastChunk = System.currentTimeMillis();