aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/java/com/MylesAndMore/tumble/EventListener.java16
-rw-r--r--src/main/java/com/MylesAndMore/tumble/Main.java10
2 files changed, 20 insertions, 6 deletions
diff --git a/src/main/java/com/MylesAndMore/tumble/EventListener.java b/src/main/java/com/MylesAndMore/tumble/EventListener.java
index 86bf851..4c3d154 100644
--- a/src/main/java/com/MylesAndMore/tumble/EventListener.java
+++ b/src/main/java/com/MylesAndMore/tumble/EventListener.java
@@ -10,6 +10,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerItemDamageEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
@@ -78,12 +79,25 @@ public class EventListener implements Listener{
if (event.getEntity().getWorld() == Bukkit.getWorld(TumbleManager.getGameWorld())) {
if (event.getEntity() instanceof Snowball) {
if (event.getEntity().getShooter() instanceof Player player) {
- player.getInventory().addItem(new ItemStack(Material.SNOWBALL));
+ player.getInventory().addItem(new ItemStack(Material.SNOWBALL,1));
}
}
}
}
}
+
+
+ @EventHandler
+ public void PlayerDropItemEvent(PlayerDropItemEvent event) {
+ // When an item is dropped, make sure there is a defined gameWorld
+ if (TumbleManager.getGameWorld() != null) {
+ // Then check if the item was dropped in the game world
+ if (event.getPlayer().getWorld() == Bukkit.getWorld((TumbleManager.getGameWorld()))) {
+ event.setCancelled(true);
+
+ }
+ }
+ }
}
diff --git a/src/main/java/com/MylesAndMore/tumble/Main.java b/src/main/java/com/MylesAndMore/tumble/Main.java
index 862de47..5c08907 100644
--- a/src/main/java/com/MylesAndMore/tumble/Main.java
+++ b/src/main/java/com/MylesAndMore/tumble/Main.java
@@ -23,15 +23,15 @@ public class Main extends JavaPlugin{
// Check if worlds are null in config
if (TumbleManager.getGameWorld() == null) {
- Bukkit.getServer().getLogger().warning("[tumble] It appears you have not configured a game world for Tumble.");
- Bukkit.getServer().getLogger().info("[tumble] If this is your first time running the plugin, you may disregard this message.");
+ Bukkit.getServer().getLogger().warning("[Tumble] It appears you have not configured a game world for Tumble.");
+ Bukkit.getServer().getLogger().info("[Tumble] If this is your first time running the plugin, you may disregard this message.");
}
if (TumbleManager.getLobbyWorld() == null) {
- Bukkit.getServer().getLogger().warning("[tumble] It appears you have not configured a lobby world for Tumble.");
- Bukkit.getServer().getLogger().info("[tumble] If this is your first time running the plugin, you may disregard this message.");
+ Bukkit.getServer().getLogger().warning("[Tumble] It appears you have not configured a lobby world for Tumble.");
+ Bukkit.getServer().getLogger().info("[Tumble] If this is your first time running the plugin, you may disregard this message.");
}
// Init message
- Bukkit.getServer().getLogger().info("[tumble] Tumble initialization complete!");
+ Bukkit.getServer().getLogger().info("[Tumble] Tumble initialization complete!");
}
} \ No newline at end of file