Upstream
/
CoreProtect
mirror of https://github.com/PlayPro/CoreProtect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 1595b18a00 into 6023c21ba9

This commit is contained in:
langua 2024-05-07 15:04:07 +12:00 committed by GitHub
parent 6023c21ba9 1595b18a00
commit 0399d737dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 145 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/coreprotect/database/logger/BlockBreakLogger.java
View File

@ -13,6 +13,7 @@ import net.coreprotect.config.Config;
import net.coreprotect.config.ConfigHandler;
import net.coreprotect.database.statement.BlockStatement;
import net.coreprotect.database.statement.UserStatement;
import net.coreprotect.event.CoreProtectBlockBreakPreLogEvent;
import net.coreprotect.event.CoreProtectPreLogEvent;
import net.coreprotect.thread.CacheHandler;
import net.coreprotect.utility.Util;
@ -53,20 +54,28 @@ public class BlockBreakLogger {
blockData = overrideData;
}
CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
// call events and fetch changed username, all other properties are readonly for now
CoreProtectPreLogEvent coreProtectPreLogEvent = new CoreProtectPreLogEvent(user);
if (Config.getGlobal().API_ENABLED) {
CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
CoreProtect.getInstance().getServer().getPluginManager().callEvent(coreProtectPreLogEvent);
}
user = coreProtectPreLogEvent.getUser();
int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
CoreProtectBlockBreakPreLogEvent coreProtectBlockBreakPreLogEvent = new CoreProtectBlockBreakPreLogEvent(user, location);
if (Config.getGlobal().API_ENABLED) {
CoreProtect.getInstance().getServer().getPluginManager().callEvent(coreProtectBlockBreakPreLogEvent);
}
user = coreProtectBlockBreakPreLogEvent.getUser();
int userId = UserStatement.getId(preparedStmt, user, true);
int wid = Util.getWorldId(location.getWorld().getName());
int time = (int) (System.currentTimeMillis() / 1000L);
int x = location.getBlockX();
int y = location.getBlockY();
int z = location.getBlockZ();
CacheHandler.breakCache.put("" + x + "." + y + "." + z + "." + wid + "", new Object[] { time, event.getUser(), type });
CacheHandler.breakCache.put("" + x + "." + y + "." + z + "." + wid + "", new Object[]{time, user, type});
if (event.isCancelled()) {
if (coreProtectPreLogEvent.isCancelled() || coreProtectBlockBreakPreLogEvent.isCancelled()) {
return;
}

21
src/main/java/net/coreprotect/database/logger/BlockPlaceLogger.java
View File

@ -13,6 +13,7 @@ import net.coreprotect.config.Config;
import net.coreprotect.config.ConfigHandler;
import net.coreprotect.database.statement.BlockStatement;
import net.coreprotect.database.statement.UserStatement;
import net.coreprotect.event.CoreProtectBlockPlacePreLogEvent;
import net.coreprotect.event.CoreProtectPreLogEvent;
import net.coreprotect.thread.CacheHandler;
import net.coreprotect.utility.Util;
@ -83,20 +84,28 @@ public class BlockPlaceLogger {
}
}
CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
// call events and fetch changed username, all other properties are readonly for now
CoreProtectPreLogEvent coreProtectPreLogEvent = new CoreProtectPreLogEvent(user);
if (Config.getGlobal().API_ENABLED) {
CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
CoreProtect.getInstance().getServer().getPluginManager().callEvent(coreProtectPreLogEvent);
}
user = coreProtectPreLogEvent.getUser();
int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
CoreProtectBlockPlacePreLogEvent coreProtectBlockPlacePreLogEvent = new CoreProtectBlockPlacePreLogEvent(user, block.getLocation(), block);
if (Config.getGlobal().API_ENABLED) {
CoreProtect.getInstance().getServer().getPluginManager().callEvent(coreProtectBlockPlacePreLogEvent);
}
user = coreProtectBlockPlacePreLogEvent.getUser();
int userId = UserStatement.getId(preparedStmt, user, true);
int wid = Util.getWorldId(block.getWorld().getName());
int time = (int) (System.currentTimeMillis() / 1000L);
if (event.getUser().length() > 0) {
CacheHandler.lookupCache.put("" + x + "." + y + "." + z + "." + wid + "", new Object[] { time, event.getUser(), type });
if (user.length() > 0) {
CacheHandler.lookupCache.put("" + x + "." + y + "." + z + "." + wid + "", new Object[]{time, user, type});
}
if (event.isCancelled()) {
if (coreProtectPreLogEvent.isCancelled() || coreProtectBlockPlacePreLogEvent.isCancelled()) {
return;
}

55
src/main/java/net/coreprotect/event/CoreProtectBlockBreakPreLogEvent.java Normal file
View File

@ -0,0 +1,55 @@
package net.coreprotect.event;
import org.bukkit.Location;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
public class CoreProtectBlockBreakPreLogEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private String user;
private final Location location;
private boolean cancelled = false;
public CoreProtectBlockBreakPreLogEvent(String user, Location location) {
super(true); // async
this.user = user;
this.location = location;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public boolean isCancelled() {
return cancelled;
}
@Override
public void setCancelled(boolean b) {
cancelled = b;
}
public String getUser() {
return user;
}
public void setUser(String newUser) {
if (newUser == null || newUser.isEmpty()) {
throw new IllegalArgumentException("Invalid user");
}
this.user = newUser;
}
public Location getLocation() {
return location;
}
}

61
src/main/java/net/coreprotect/event/CoreProtectBlockPlacePreLogEvent.java Normal file
View File

@ -0,0 +1,61 @@
package net.coreprotect.event;
import org.bukkit.Location;
import org.bukkit.block.BlockState;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
public class CoreProtectBlockPlacePreLogEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private String user;
private final Location location;
private final BlockState blockState;
private boolean cancelled = false;
public CoreProtectBlockPlacePreLogEvent(String user, Location location, BlockState blockState) {
super(true); // async
this.user = user;
this.location = location;
this.blockState = blockState;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public boolean isCancelled() {
return cancelled;
}
@Override
public void setCancelled(boolean b) {
cancelled = b;
}
public String getUser() {
return user;
}
public void setUser(String newUser) {
if (newUser == null || newUser.isEmpty()) {
throw new IllegalArgumentException("Invalid user");
}
this.user = newUser;
}
public Location getLocation() {
return location;
}
public BlockState getBlockState() {
return blockState;
}
}