Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Intelli
|
75f66bf212 | ||
|
Intelli
|
64106e2d64 | ||
|
Intelli
|
975a030ebe | ||
|
Intelli
|
829f4e95d5 | ||
|
Intelli
|
96292c82c3 | ||
|
Intelli
|
dad51fc900 |
No files matched your search
+1
-1
@@ -7,7 +7,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = 'net.coreprotect'
|
||||
String projectVersion = '21.0'
|
||||
String projectVersion = '21.1'
|
||||
String projectBranch = ''
|
||||
version = projectVersion // `version` might be modified, we don't always want that (e.g. plugin.yml)
|
||||
description = 'Provides block protection for your server.'
|
||||
|
||||
@@ -245,6 +245,8 @@ By default, if no radius is specified, a radius of 10 will be applied, restricti
|
||||
*(rollback griefing Notch did in the last hour that is within 20 blocks of you)*
|
||||
* `/co rollback u:Notch t:1h r:#nether`
|
||||
*(rollback griefing Notch did in the last hour ONLY in the Nether)*
|
||||
* `/co rollback u:Notch t:5m a:inventory`
|
||||
*(rollback inventory transactions by Notch in the last 5 minutes)*
|
||||
* `/co rollback t:15m r:30`
|
||||
*(rollback everything done in the last 15 minutes by anyone within 30 blocks of you)*
|
||||
* `/co rollback t:15m r:#worldedit`
|
||||
@@ -260,6 +262,8 @@ Lookup commands are generally the same as rollback commands. The primary differe
|
||||
*(lookup all diamond ore mined in the last hour)*
|
||||
* `/co lookup u:Notch t:30m a:chat`
|
||||
*(lookup chat messages sent by Notch in the last 30 minutes)*
|
||||
* `/co lookup u:Notch t:3d a:inventory`
|
||||
*(lookup inventory transactions by Notch in the last 3 days)*
|
||||
* `/co lookup u:Notch a:login`
|
||||
*(lookup all logins ever done by Notch)*
|
||||
* `/co lookup u:Notch a:login`
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>net.coreprotect</groupId>
|
||||
<artifactId>CoreProtect</artifactId>
|
||||
<version>21.0</version>
|
||||
<version>21.1</version>
|
||||
<properties>
|
||||
<project.branch></project.branch>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
@@ -749,14 +749,14 @@ public class LookupCommand {
|
||||
}
|
||||
if (exists) {
|
||||
for (String check : euserlist) {
|
||||
if (!check.equals("#global")) {
|
||||
if (!check.equals("#global") && !check.equals("#hopper")) {
|
||||
exists = PlayerLookup.playerExists(connection, check);
|
||||
if (!exists) {
|
||||
baduser = check;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
else if (check.equals("#global")) {
|
||||
baduser = "#global";
|
||||
exists = false;
|
||||
}
|
||||
|
||||
@@ -368,14 +368,14 @@ public class RollbackRestoreCommand {
|
||||
}
|
||||
if (exists) {
|
||||
for (String check : euserlist) {
|
||||
if (!check.equals("#global")) {
|
||||
if (!check.equals("#global") && !check.equals("#hopper")) {
|
||||
exists = PlayerLookup.playerExists(connection, check);
|
||||
if (!exists) {
|
||||
baduser = check;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
else if (check.equals("#global")) {
|
||||
baduser = "#global";
|
||||
exists = false;
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ public class ContainerRollback extends Queue {
|
||||
action = 1;
|
||||
}
|
||||
|
||||
ItemStack itemstack = new ItemStack(rowType, rowAmount, (short) rowData);
|
||||
ItemStack itemstack = new ItemStack(rowType, rowAmount);
|
||||
Object[] populatedStack = Rollback.populateItemStack(itemstack, rowMetadata);
|
||||
int slot = (Integer) populatedStack[0];
|
||||
String faceData = (String) populatedStack[1];
|
||||
|
||||
@@ -1091,7 +1091,7 @@ public class Rollback extends Queue {
|
||||
}
|
||||
|
||||
int action = rollbackType == 0 ? (inventoryAction ^ 1) : inventoryAction;
|
||||
ItemStack itemstack = new ItemStack(inventoryItem, rowAmount, (short) rowData);
|
||||
ItemStack itemstack = new ItemStack(inventoryItem, rowAmount);
|
||||
Object[] populatedStack = populateItemStack(itemstack, rowMetadata);
|
||||
if (rowAction == ItemLogger.ITEM_REMOVE_ENDER || rowAction == ItemLogger.ITEM_ADD_ENDER) {
|
||||
modifyContainerItems(containerType, player.getEnderChest(), (Integer) populatedStack[0], ((ItemStack) populatedStack[2]).clone(), action ^ 1);
|
||||
@@ -1108,7 +1108,7 @@ public class Rollback extends Queue {
|
||||
}
|
||||
|
||||
if ((rollbackType == 0 && rowRolledBack == 0) || (rollbackType == 1 && rowRolledBack == 1)) {
|
||||
ItemStack itemstack = new ItemStack(rowType, rowAmount, (short) rowData);
|
||||
ItemStack itemstack = new ItemStack(rowType, rowAmount);
|
||||
Object[] populatedStack = populateItemStack(itemstack, rowMetadata);
|
||||
String faceData = (String) populatedStack[1];
|
||||
|
||||
|
||||
@@ -182,7 +182,7 @@ public class ContainerLogger extends Queue {
|
||||
int y = location.getBlockY();
|
||||
int z = location.getBlockZ();
|
||||
int typeId = Util.getBlockId(item.getType().name(), true);
|
||||
int data = item.getDurability();
|
||||
int data = 0;
|
||||
int amount = item.getAmount();
|
||||
ContainerStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, typeId, data, amount, metadata, action, 0);
|
||||
}
|
||||
|
||||
@@ -53,6 +53,9 @@ public final class BlockIgniteListener extends Queue implements Listener {
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (event.getCause() == IgniteCause.ENDER_CRYSTAL && blockBelow == Material.AIR) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
BlockState replacedBlock = null;
|
||||
|
||||
@@ -171,6 +171,7 @@ public final class CraftItemListener extends Queue implements Listener {
|
||||
}
|
||||
|
||||
if (addItem.getAmount() > 0) {
|
||||
Location location = (isTrade || event.getInventory().getLocation() == null) ? player.getLocation() : event.getInventory().getLocation();
|
||||
for (ItemStack oldItem : oldItems) {
|
||||
if (oldItem == null || oldItem.getType() == Material.AIR) {
|
||||
continue;
|
||||
@@ -181,10 +182,10 @@ public final class CraftItemListener extends Queue implements Listener {
|
||||
return;
|
||||
}
|
||||
removedItem.setAmount(removedItem.getAmount() * amountMultiplier);
|
||||
logCraftedItem(event.getInventory().getLocation(), player.getName(), removedItem, isTrade ? ItemLogger.ITEM_SELL : ItemLogger.ITEM_DESTROY);
|
||||
logCraftedItem(location, player.getName(), removedItem, isTrade ? ItemLogger.ITEM_SELL : ItemLogger.ITEM_DESTROY);
|
||||
}
|
||||
|
||||
logCraftedItem(event.getInventory().getLocation(), player.getName(), addItem, isTrade ? ItemLogger.ITEM_BUY : ItemLogger.ITEM_CREATE);
|
||||
logCraftedItem(location, player.getName(), addItem, isTrade ? ItemLogger.ITEM_BUY : ItemLogger.ITEM_CREATE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ import java.util.Set;
|
||||
import java.util.SortedSet;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import org.bukkit.Art;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@@ -628,10 +627,6 @@ public class Util extends Queue {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static int getArtId(Art art) {
|
||||
return art.getId();
|
||||
}
|
||||
|
||||
public static int getArtId(String name, boolean internal) {
|
||||
int id = -1;
|
||||
name = name.toLowerCase(Locale.ROOT).trim();
|
||||
@@ -1175,10 +1170,6 @@ public class Util extends Queue {
|
||||
return new ItemStack(type, amount);
|
||||
}
|
||||
|
||||
public static ItemStack newItemStack(Material type, int amount, short data) {
|
||||
return new ItemStack(type, amount, data);
|
||||
}
|
||||
|
||||
public static boolean isSpigot() {
|
||||
try {
|
||||
Class.forName("org.spigotmc.SpigotConfig");
|
||||
|
||||
Reference in new issue
Block a user