Added configurable anti-grief
This commit is contained in:
@@ -14,6 +14,7 @@ import io.anuke.mindustry.net.Packets.*;
|
||||
import io.anuke.mindustry.resource.*;
|
||||
import io.anuke.mindustry.world.Block;
|
||||
import io.anuke.mindustry.world.Placement;
|
||||
import io.anuke.mindustry.world.Tile;
|
||||
import io.anuke.ucore.core.Events;
|
||||
import io.anuke.ucore.core.Timers;
|
||||
import io.anuke.ucore.entities.Entities;
|
||||
@@ -199,6 +200,14 @@ public class NetServer extends Module{
|
||||
|
||||
if(recipe == null) return;
|
||||
|
||||
Tile tile = world.tile(packet.x, packet.y);
|
||||
if(tile.synthetic() && !admins.validateBreak(admins.getTrace(Net.getConnection(id).address).uuid, Net.getConnection(id).address)){
|
||||
if(Timers.get("break-message-" + id, 120)){
|
||||
sendMessageTo(id, "[scarlet]Anti-grief: you are replacing blocks too quickly. wait until replacing again.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
state.inventory.removeItems(recipe.requirements);
|
||||
|
||||
Placement.placeBlock(packet.x, packet.y, block, packet.rotation, true, false);
|
||||
@@ -215,6 +224,15 @@ public class NetServer extends Module{
|
||||
|
||||
if(!Placement.validBreak(packet.x, packet.y)) return;
|
||||
|
||||
Tile tile = world.tile(packet.x, packet.y);
|
||||
|
||||
if(tile.synthetic() && !admins.validateBreak(admins.getTrace(Net.getConnection(id).address).uuid, Net.getConnection(id).address)){
|
||||
if(Timers.get("break-message-" + id, 120)){
|
||||
sendMessageTo(id, "[scarlet]Anti-grief: you are breaking blocks too quickly. wait until breaking again.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
Block block = Placement.breakBlock(packet.x, packet.y, true, false);
|
||||
|
||||
if(block != null) {
|
||||
@@ -376,6 +394,12 @@ public class NetServer extends Module{
|
||||
admins.save();
|
||||
}
|
||||
|
||||
void sendMessageTo(int id, String message){
|
||||
ChatPacket packet = new ChatPacket();
|
||||
packet.text = message;
|
||||
Net.sendTo(id, packet, SendMode.tcp);
|
||||
}
|
||||
|
||||
void sync(){
|
||||
|
||||
if(timer.get(timerEntitySync, serverSyncTime)){
|
||||
|
||||
@@ -3,9 +3,13 @@ package io.anuke.mindustry.net;
|
||||
import com.badlogic.gdx.utils.Array;
|
||||
import com.badlogic.gdx.utils.Json;
|
||||
import com.badlogic.gdx.utils.ObjectMap;
|
||||
import com.badlogic.gdx.utils.TimeUtils;
|
||||
import io.anuke.ucore.core.Settings;
|
||||
|
||||
public class Administration {
|
||||
public static final int defaultMaxBrokenBlocks = 15;
|
||||
public static final int defaultBreakCooldown = 1000*15;
|
||||
|
||||
private Json json = new Json();
|
||||
/**All player info. Maps UUIDs to info. This persists throughout restarts.*/
|
||||
private ObjectMap<String, PlayerInfo> playerInfo = new ObjectMap<>();
|
||||
@@ -14,12 +18,68 @@ public class Administration {
|
||||
private Array<String> bannedIPs = new Array<>();
|
||||
|
||||
public Administration(){
|
||||
Settings.defaults("playerInfo", "{}");
|
||||
Settings.defaults("bannedIPs", "{}");
|
||||
Settings.defaultList(
|
||||
"playerInfo", "{}",
|
||||
"bannedIPs", "{}",
|
||||
"antigrief", false,
|
||||
"antigrief-max", defaultMaxBrokenBlocks,
|
||||
"antigrief-cooldown", defaultBreakCooldown
|
||||
);
|
||||
|
||||
load();
|
||||
}
|
||||
|
||||
public boolean isAntiGrief(){
|
||||
return Settings.getBool("antigrief");
|
||||
}
|
||||
|
||||
public void setAntiGrief(boolean antiGrief){
|
||||
Settings.putBool("antigrief", antiGrief);
|
||||
Settings.save();
|
||||
}
|
||||
|
||||
public void setAntiGriefParams(int maxBreak, int cooldown){
|
||||
Settings.putInt("antigrief-max", maxBreak);
|
||||
Settings.putInt("antigrief-cooldown", cooldown);
|
||||
Settings.save();
|
||||
}
|
||||
|
||||
public boolean validateBreak(String id, String ip){
|
||||
if(!isAntiGrief() || isAdmin(id, ip)) return true;
|
||||
|
||||
PlayerInfo info = getCreateInfo(id);
|
||||
|
||||
if(info.lastBroken == null || info.lastBroken.length != Settings.getInt("antigrief-max")){
|
||||
info.lastBroken = new long[Settings.getInt("antigrief-max")];
|
||||
}
|
||||
|
||||
long[] breaks = info.lastBroken;
|
||||
|
||||
int shiftBy = 0;
|
||||
for(int i = 0; i < breaks.length && breaks[i] != 0; i ++){
|
||||
if(TimeUtils.timeSinceMillis(breaks[i]) >= Settings.getInt("antigrief-cooldown")){
|
||||
shiftBy = i;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < breaks.length; i++) {
|
||||
breaks[i] = (i + shiftBy >= breaks.length) ? 0 : breaks[i + shiftBy];
|
||||
}
|
||||
|
||||
int remaining = 0;
|
||||
for(int i = 0; i < breaks.length; i ++){
|
||||
if(breaks[i] == 0){
|
||||
remaining = breaks.length - i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(remaining == 0) return false;
|
||||
|
||||
breaks[breaks.length - remaining] = TimeUtils.millis();
|
||||
return true;
|
||||
}
|
||||
|
||||
/**Call when a player joins to update their information here.*/
|
||||
public void updatePlayerJoined(String id, String ip, String name){
|
||||
PlayerInfo info = getCreateInfo(id);
|
||||
@@ -248,6 +308,8 @@ public class Administration {
|
||||
public boolean banned, admin;
|
||||
public long lastKicked; //last kicked timestamp
|
||||
|
||||
public long[] lastBroken;
|
||||
|
||||
PlayerInfo(String id){
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
@@ -180,6 +180,11 @@ public class Tile{
|
||||
Block floor = floor();
|
||||
return isLinked() || !((floor.solid && (block == Blocks.air || block.solidifes)) || (block.solid && (!block.destructible && !block.update)));
|
||||
}
|
||||
|
||||
public boolean synthetic(){
|
||||
Block block = block();
|
||||
return block.update || block.destructible;
|
||||
}
|
||||
|
||||
public boolean solid(){
|
||||
Block block = block();
|
||||
|
||||
Reference in New Issue
Block a user