diff options
| author | Sychic <Sychic@github.com> | 2020-12-11 19:15:20 -0500 |
|---|---|---|
| committer | Sychic <Sychic@github.com> | 2020-12-11 19:15:20 -0500 |
| commit | f04296de38493e1eb00a9e6351a0b821b3c0fff1 (patch) | |
| tree | b6fe8a56e43ad58f486ea50434c778446b422e25 /src/main/java/me/Danker/DankersSkyblockMod.java | |
| parent | ced6807030054015ba30ebfa62e0908f3a6f744a (diff) | |
| download | SkyblockMod-f04296de38493e1eb00a9e6351a0b821b3c0fff1.tar.gz SkyblockMod-f04296de38493e1eb00a9e6351a0b821b3c0fff1.tar.bz2 SkyblockMod-f04296de38493e1eb00a9e6351a0b821b3c0fff1.zip | |
resolve conflicts
Diffstat (limited to 'src/main/java/me/Danker/DankersSkyblockMod.java')
| -rw-r--r-- | src/main/java/me/Danker/DankersSkyblockMod.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java index 7e67d6c..c8eaff5 100644 --- a/src/main/java/me/Danker/DankersSkyblockMod.java +++ b/src/main/java/me/Danker/DankersSkyblockMod.java @@ -474,7 +474,7 @@ public class DankersSkyblockMod event.setCanceled(true); return; } - + // Implosion if (!ToggleCommand.implosionMessages) { if (message.contains("Your Implosion hit ") || message.contains("There are blocks in the way")) { event.setCanceled(true); |