AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-07-03 09:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

add "Interaction" result action string check

Browse Source 
fixes container interactions being logged as block removals
This commit is contained in:
speed 2020-12-01 18:53:28 -05:00
parent 4898bcf7b5
commit 8ed35aba2b
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java
View File

@ -333,10 +333,14 @@ public class CoreProtectBridge extends FreedomService
{ {
s = " placed "; s = " placed ";
} }
else else if (result.getActionString().equals("Removal"))
{ {
s = " broke "; s = " broke ";
} }
else
{
s = " interacted with ";
}
if (result.isRolledBack()) if (result.isRolledBack())
{ {
@ -365,9 +369,15 @@ public class CoreProtectBridge extends FreedomService
{ {
if (data.hasInspection()) if (data.hasInspection())
{ {
BlockState placedBlock = block.getRelative(event.getBlockFace()).getState(); BlockState blockState = block.getRelative(event.getBlockFace()).getState();
Block placedBlock = blockState.getBlock();
event.setCancelled(true); event.setCancelled(true);
List<String[]> lookup = coreProtect.blockLookup(placedBlock.getBlock(), -1); List<String[]> lookup = coreProtect.blockLookup(placedBlock, -1);
if (lookup.isEmpty())
{
lookup = coreProtect.blockLookup(block, -1);
}
int cooldownTime = 3; int cooldownTime = 3;
@ -414,10 +424,14 @@ public class CoreProtectBridge extends FreedomService
{ {
s = " placed "; s = " placed ";
} }
else else if (result.getActionString().equals("Removal"))
{ {
s = " broke "; s = " broke ";
} }
else
{
s = " interacted with ";
}
if (result.isRolledBack()) if (result.isRolledBack())
{ {