Ignore snowballs, etc. from triggering PvP timer
If _really_ desired, I could add an option for this. But more often than not, unintended deaths could occur from players disconnecting from a snowball fight.
This commit is contained in:
parent
4c4c8ea1fe
commit
29538c69fe
69
.gitignore
vendored
Normal file
69
.gitignore
vendored
Normal file
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user