diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a0da5cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,69 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+# ZEINTELLIJ
+workspace.xml
+tasks.xml
+.idea/libraries
+.idea/copyright
+out/
+target/
+*.MF
+*.name
+.idea
+*.iml
\ No newline at end of file
diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 2b4ff4b..757e8cd 100644
--- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -1043,6 +1043,9 @@ public class EntityEventHandler implements Listener
         
         //only interested in entities damaging entities (ignoring environmental damage)
         if(!(event instanceof EntityDamageByEntityEvent)) return;
+
+		//Ignore "damage" from snowballs, eggs, etc. from triggering the PvP timer
+		if (event.getDamage() == 0) return;
         
         EntityDamageByEntityEvent subEvent = (EntityDamageByEntityEvent) event;