mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-19 19:59:37 +00:00
Created a validateAndSend method to validate packets against the access rights prior to sending them.
This commit is contained in:
1 parent
58cb0d9e23
commit
009eee3fca
5 files changed
+36
-9
No files matched your search
@@ -143,7 +143,7 @@ public class OpisServerTickHandler implements ITickHandler {
|
||||
ArrayList<AmountHolder> amountEntities = EntityManager.getCumulativeEntities(filtered);
|
||||
|
||||
// Here we send a full update to the player
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player);
|
||||
OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player);
|
||||
}
|
||||
|
||||
for (Player player : PlayerTracker.instance().playersOpis)
|
||||
@@ -169,7 +169,7 @@ public class OpisServerTickHandler implements ITickHandler {
|
||||
PacketDispatcher.sendPacketToPlayer( Packet_LoadedChunks.create(ChunkManager.getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player);
|
||||
if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.MEANTIME){
|
||||
ArrayList<StatsChunk> timingChunks = ChunkManager.getTopChunks(100);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player);
|
||||
OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import java.util.ArrayList;
|
||||
import mapwriter.Mw;
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.data.client.DataCache;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialDouble;
|
||||
import mcp.mobius.opis.data.holders.basetypes.SerialInt;
|
||||
@@ -25,6 +26,7 @@ import mcp.mobius.opis.network.client.Packet_ReqChunks;
|
||||
import mcp.mobius.opis.network.client.Packet_ReqData;
|
||||
import mcp.mobius.opis.network.enums.AccessLevel;
|
||||
import mcp.mobius.opis.network.enums.DataReq;
|
||||
import mcp.mobius.opis.network.server.Packet250Metadata;
|
||||
import mcp.mobius.opis.network.server.Packet_Chunks;
|
||||
import mcp.mobius.opis.network.server.Packet_ClientCommand;
|
||||
import mcp.mobius.opis.network.server.Packet_DataList;
|
||||
@@ -264,9 +266,14 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
}
|
||||
}
|
||||
|
||||
public static void sendPacketToAllSwing(Packet250CustomPayload packet){
|
||||
for (Player player : PlayerTracker.instance().playersSwing)
|
||||
public static void validateAndSend(Packet250Metadata packet, Player player){
|
||||
if (packet.dataReq.canPlayerUseCommand(player))
|
||||
PacketDispatcher.sendPacketToPlayer(packet, player);
|
||||
}
|
||||
|
||||
public static void sendPacketToAllSwing(Packet250Metadata packet){
|
||||
for (Player player : PlayerTracker.instance().playersSwing)
|
||||
OpisPacketHandler.validateAndSend(packet, player);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package mcp.mobius.opis.network.server;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.network.enums.DataReq;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet250Metadata extends Packet250CustomPayload {
|
||||
|
||||
public DataReq dataReq;
|
||||
public ISerializable dataValue;
|
||||
public ArrayList<? extends ISerializable> dataList;
|
||||
}
|
||||
@@ -42,8 +42,8 @@ public class Packet_DataList {
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(DataReq dataReq, ArrayList<? extends ISerializable> stats){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
public static Packet250Metadata create(DataReq dataReq, ArrayList<? extends ISerializable> stats){
|
||||
Packet250Metadata packet = new Packet250Metadata();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream ostream = new DataOutputStream(bos);
|
||||
|
||||
@@ -59,6 +59,9 @@ public class Packet_DataList {
|
||||
data.writeToStream(ostream);
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.dataReq = dataReq;
|
||||
packet.dataList = stats;
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
@@ -32,10 +32,10 @@ public class Packet_DataValue {
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(DataReq dataReq, ISerializable data){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
public static Packet250Metadata create(DataReq dataReq, ISerializable data){
|
||||
Packet250Metadata packet = new Packet250Metadata();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream ostream = new DataOutputStream(bos);
|
||||
DataOutputStream ostream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
ostream.writeByte(Packets.DATA_VALUE_GENERAL);
|
||||
@@ -45,6 +45,9 @@ public class Packet_DataValue {
|
||||
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.dataReq = dataReq;
|
||||
packet.dataValue = data;
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
Reference in new issue
Block a user