From 25ad80be604720a8ff2ad77bc252a799ac689d33 Mon Sep 17 00:00:00 2001 From: marcocorriero Date: Thu, 16 Nov 2017 14:48:54 +0100 Subject: [PATCH 1/4] Makes Trail loggeable to coreprotect. --- .../totalfreedommod/fun/Trailer.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java index 78e26274..8893e79f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java @@ -1,12 +1,12 @@ package me.totalfreedom.totalfreedommod.fun; import java.util.HashSet; -import java.util.List; import java.util.Random; import java.util.Set; import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.util.DepreciationAggregator; +import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -14,11 +14,15 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; + public class Trailer extends FreedomService { + public byte data; + + private final Random random = new Random(); - private final Set trailPlayers = new HashSet<>(); // player name + public final Set trailPlayers = new HashSet<>(); // player name public Trailer(TotalFreedomMod plugin) { @@ -60,8 +64,23 @@ public class Trailer extends FreedomService return; } + final Location location = fromBlock.getLocation(); + fromBlock.setType(Material.WOOL); DepreciationAggregator.setData_Block(fromBlock, (byte) random.nextInt(16)); + final byte data = DepreciationAggregator.getData_Block(fromBlock); + Material material = Material.getMaterial(String.valueOf(fromBlock.getType())); + for (int x = -1; x <= 1; x++) + { + for (int z = -1; z <= 1; z++) + { + final Location trail_pos; + trail_pos = new Location(event.getPlayer().getWorld(), fromBlock.getX() + x, fromBlock.getY(), fromBlock.getZ() + z); + if (trailPlayers.contains(event.getPlayer().getName())) { + plugin.cpb.getCoreProtectAPI().logPlacement(event.getPlayer().getName(), trail_pos, material, data); + } + } + } } public void remove(Player player) From 3babdf88a21a098587ad46d753beee9e74f3476d Mon Sep 17 00:00:00 2001 From: marcocorriero Date: Thu, 16 Nov 2017 14:54:53 +0100 Subject: [PATCH 2/4] Update Trailer.java --- src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java index 8893e79f..5ad7568f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java @@ -22,7 +22,7 @@ public class Trailer extends FreedomService private final Random random = new Random(); - public final Set trailPlayers = new HashSet<>(); // player name + private final Set trailPlayers = new HashSet<>(); // player name public Trailer(TotalFreedomMod plugin) { From cba204d9f3ecb3eb15a5c455c164f8add64e52ab Mon Sep 17 00:00:00 2001 From: marcocorriero Date: Fri, 17 Nov 2017 14:12:21 +0100 Subject: [PATCH 3/4] Applying requested changes --- .../java/me/totalfreedom/totalfreedommod/fun/Trailer.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java index 5ad7568f..2397aa55 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java @@ -18,9 +18,7 @@ import org.bukkit.event.player.PlayerMoveEvent; public class Trailer extends FreedomService { - public byte data; - - + private byte data; private final Random random = new Random(); private final Set trailPlayers = new HashSet<>(); // player name @@ -65,10 +63,9 @@ public class Trailer extends FreedomService } final Location location = fromBlock.getLocation(); - fromBlock.setType(Material.WOOL); DepreciationAggregator.setData_Block(fromBlock, (byte) random.nextInt(16)); - final byte data = DepreciationAggregator.getData_Block(fromBlock); + private byte data = DepreciationAggregator.getData_Block(fromBlock); Material material = Material.getMaterial(String.valueOf(fromBlock.getType())); for (int x = -1; x <= 1; x++) { From a10a0cbef964a4ea3e86c124f3ce032e6c251d82 Mon Sep 17 00:00:00 2001 From: marcocorriero Date: Wed, 22 Nov 2017 20:48:45 +0100 Subject: [PATCH 4/4] Update Trailer.java --- .../java/me/totalfreedom/totalfreedommod/fun/Trailer.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java index 2397aa55..e44344ac 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java @@ -14,11 +14,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; - public class Trailer extends FreedomService { - - private byte data; private final Random random = new Random(); private final Set trailPlayers = new HashSet<>(); // player name @@ -65,7 +62,7 @@ public class Trailer extends FreedomService final Location location = fromBlock.getLocation(); fromBlock.setType(Material.WOOL); DepreciationAggregator.setData_Block(fromBlock, (byte) random.nextInt(16)); - private byte data = DepreciationAggregator.getData_Block(fromBlock); + byte data = DepreciationAggregator.getData_Block(fromBlock); Material material = Material.getMaterial(String.valueOf(fromBlock.getType())); for (int x = -1; x <= 1; x++) {