Skip to content

Commit 6d6f1aa

Browse files
committed
add allow-creative
1 parent b2ef154 commit 6d6f1aa

File tree

9 files changed

+12
-9
lines changed

9 files changed

+12
-9
lines changed

src/main/java/lol/hyper/toolstats/events/BlockBreak.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void onBreak(BlockBreakEvent event) {
4848
return;
4949
}
5050
Player player = event.getPlayer();
51-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
51+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
5252
return;
5353
}
5454
PlayerInventory inventory = player.getInventory();

src/main/java/lol/hyper/toolstats/events/CraftItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void onCraft(CraftItemEvent event) {
5050
return;
5151
}
5252
Player player = (Player) event.getWhoClicked();
53-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
53+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
5454
return;
5555
}
5656
ItemStack craftedItem = event.getCurrentItem();

src/main/java/lol/hyper/toolstats/events/EntityDamage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void onDamage(EntityDamageEvent event) {
156156

157157
// player is taking damage
158158
if (mobBeingAttacked instanceof Player playerTakingDamage) {
159-
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
159+
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
160160
return;
161161
}
162162
updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());

src/main/java/lol/hyper/toolstats/events/PickupItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void onPickup(EntityPickupItemEvent event) {
5454
}
5555
Entity entity = event.getEntity();
5656
if (entity instanceof Player player) {
57-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
57+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
5858
return;
5959
}
6060
Item item = event.getItem();

src/main/java/lol/hyper/toolstats/events/PlayerFish.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void onFish(PlayerFishEvent event) {
5757
}
5858

5959
Player player = event.getPlayer();
60-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
60+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
6161
return;
6262
}
6363

src/main/java/lol/hyper/toolstats/events/PlayerInteract.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void onInteract(PlayerInteractEvent event) {
5858
}
5959

6060
Player player = event.getPlayer();
61-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
61+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
6262
return;
6363
}
6464
// store when a player opens a chest
@@ -72,7 +72,7 @@ public void onInteract(PlayerInteractEvent event) {
7272
public void onInteract(PlayerInteractEntityEvent event) {
7373
Entity clicked = event.getRightClicked();
7474
Player player = event.getPlayer();
75-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
75+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
7676
return;
7777
}
7878
// store when a player opens a minecart

src/main/java/lol/hyper/toolstats/events/SheepShear.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void onShear(PlayerInteractEntityEvent event) {
4545
return;
4646
}
4747
Player player = event.getPlayer();
48-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
48+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
4949
return;
5050
}
5151
Entity entity = event.getRightClicked();

src/main/java/lol/hyper/toolstats/events/ShootBow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void onShoot(EntityShootBowEvent event) {
4646
return;
4747
}
4848

49-
if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.ADVENTURE) {
49+
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
5050
return;
5151
}
5252

src/main/resources/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,7 @@ generate-hash-for-items: false
271271
# This makes dates for items more "normalized" instead of being at different times.
272272
normalize-time-creation: false
273273

274+
# Allows stats and origins to be tracked if the player is in creative mode.
275+
allow-creative: false
276+
274277
config-version: 12

0 commit comments

Comments
 (0)