Added an OnPvP compatability event #356
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Alleviate the Forge bug causing duplicate posts of the LivingAttackEvent. Forge posts this event twice, once in EntityPlayer, and once in EntityLivingBase, so this tells if an EntityPlayer got hurt but the event was posted as an EntityLivingBase, then immediately returns, so nothing important gets run twice.
mahtaran
suggested changes
Jul 29, 2019
src/main/java/pvpmode/internal/server/PvPServerEventHandler.java
Outdated
Show resolved
Hide resolved
| * function will be invoked twice per attack - this is because of a Forge bug. | ||
| * Cancels combat events associated with PvP-disabled players. Note that | ||
| * this function will be invoked twice per attack - this is because of a | ||
| * Forge bug, but the {@link PvPCommonUtils isCurrentAttackDuplicate} call |
There was a problem hiding this comment.
Suggested change
| * Forge bug, but the {@link PvPCommonUtils isCurrentAttackDuplicate} call | |
| * Forge bug, but the {@link PvPCommonUtils#isCurrentAttackDuplicate()} call |
Possibly the parentheses after the method are not required, not too sure.
There was a problem hiding this comment.
It works with them, so they might as well be added.
CraftedMods
requested changes
Jul 29, 2019
CraftedMods
approved these changes
Jul 31, 2019
|
@VinyarionHyarmendacil When @mahtaran does approve it too, please do a squash-merge (should be the only option) and use |
mahtaran
approved these changes
Jul 31, 2019
src/main/java/pvpmode/internal/server/PvPServerEventHandler.java
Outdated
Show resolved
Hide resolved
`pvpadmin resetCooldown <player>` and `pvpadmin spy <player> [on|off]`
Co-Authored-By: Mahtaran <[email protected]>
|
@VinyarionHyarmendacil The pvpadmin change doesn't belong to this PR. PRs are centered around one feature. Please move that to another one. |
This reverts commit f69c7c9.
|
Yeah, I accidently pushed it, didn't mean to. |
VinyarionHyarmendacil
merged commit cccc19c
into
Lembas-Modding-Team:development_not-reviewed
CraftedMods
added a commit
to CraftedMods/pvp-mode
that referenced
this pull request
Aug 13, 2019
CraftedMods
pushed a commit
that referenced
this pull request
Aug 26, 2019
* Added an OnPvP compatability event See Issue #338: #338 * Fixed duplicate LivingAttackEvents Alleviate the Forge bug causing duplicate posts of the LivingAttackEvent. Forge posts this event twice, once in EntityPlayer, and once in EntityLivingBase, so this tells if an EntityPlayer got hurt but the event was posted as an EntityLivingBase, then immediately returns, so nothing important gets run twice. * Review 1: Added an OnPvP compatability event * Improved pvpadmin command `pvpadmin resetCooldown <player>` and `pvpadmin spy <player> [on|off]` * Review 2: Added an OnPvP compatability event Co-Authored-By: Mahtaran <[email protected]> Update src/main/java/pvpmode/api/server/compatibility/events/OnPvPEvent.java Co-Authored-By: Mahtaran <[email protected]>
CraftedMods
pushed a commit
that referenced
this pull request
Aug 26, 2019
* Added an OnPvP compatability event See Issue #338: #338 * Fixed duplicate LivingAttackEvents Alleviate the Forge bug causing duplicate posts of the LivingAttackEvent. Forge posts this event twice, once in EntityPlayer, and once in EntityLivingBase, so this tells if an EntityPlayer got hurt but the event was posted as an EntityLivingBase, then immediately returns, so nothing important gets run twice. * Review 1: Added an OnPvP compatability event * Improved pvpadmin command `pvpadmin resetCooldown <player>` and `pvpadmin spy <player> [on|off]` * Review 2: Added an OnPvP compatability event Co-Authored-By: Mahtaran <[email protected]> Update src/main/java/pvpmode/api/server/compatibility/events/OnPvPEvent.java Co-Authored-By: Mahtaran <[email protected]>
CraftedMods
pushed a commit
that referenced
this pull request
Aug 26, 2019
* Added an OnPvP compatability event See Issue #338: #338 * Fixed duplicate LivingAttackEvents Alleviate the Forge bug causing duplicate posts of the LivingAttackEvent. Forge posts this event twice, once in EntityPlayer, and once in EntityLivingBase, so this tells if an EntityPlayer got hurt but the event was posted as an EntityLivingBase, then immediately returns, so nothing important gets run twice. * Review 1: Added an OnPvP compatability event * Improved pvpadmin command `pvpadmin resetCooldown <player>` and `pvpadmin spy <player> [on|off]` * Review 2: Added an OnPvP compatability event Co-Authored-By: Mahtaran <[email protected]> Update src/main/java/pvpmode/api/server/compatibility/events/OnPvPEvent.java Co-Authored-By: Mahtaran <[email protected]>
CraftedMods
added a commit
to CraftedMods/pvp-mode
that referenced
this pull request
Aug 26, 2019
CraftedMods
added a commit
that referenced
this pull request
Aug 26, 2019
VinyarionHyarmendacil
added a commit
that referenced
this pull request
Dec 16, 2019
* Renamed the faction placeholders HARAD and RHUN Fixes a warning because the faction RHUN exists too. * Added support for pledging specifiers * Updated to v35.2 of the LOTR Mod * Fixed a crash in singleplayer * Added an OnPvP compatability event See Issue #338: #338 * Fixed duplicate LivingAttackEvents Alleviate the Forge bug causing duplicate posts of the LivingAttackEvent. Forge posts this event twice, once in EntityPlayer, and once in EntityLivingBase, so this tells if an EntityPlayer got hurt but the event was posted as an EntityLivingBase, then immediately returns, so nothing important gets run twice. * Review 1: Added an OnPvP compatability event * Improved pvpadmin command `pvpadmin resetCooldown <player>` and `pvpadmin spy <player> [on|off]` * Review 2: Added an OnPvP compatability event Co-Authored-By: Mahtaran <[email protected]> * Revert "Improved pvpadmin command" This reverts commit f69c7c9. * Added an OnPvP compatability event (#356) * Added an OnPvP compatability event See Issue #338: #338 * Fixed duplicate LivingAttackEvents Alleviate the Forge bug causing duplicate posts of the LivingAttackEvent. Forge posts this event twice, once in EntityPlayer, and once in EntityLivingBase, so this tells if an EntityPlayer got hurt but the event was posted as an EntityLivingBase, then immediately returns, so nothing important gets run twice. * Review 1: Added an OnPvP compatability event * Improved pvpadmin command `pvpadmin resetCooldown <player>` and `pvpadmin spy <player> [on|off]` * Review 2: Added an OnPvP compatability event Co-Authored-By: Mahtaran <[email protected]> * Improved pvpadmin command, again `pvpadmin resetCooldown <player>` and `pvpadmin spy <player> [on|off]` * Added togglable ability to poison drinks See Issue #333 * Revert "Added togglable ability to poison drinks" This reverts commit 510ebdd. * Update src/main/java/pvpmode/internal/server/command/PvPCommandAdmin.java Co-Authored-By: Mahtaran <[email protected]> * Update CHANGELOG.md * Update ServerCommandConstants.java * Fixed whitespace and incorrect conflict resolution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Issue #338.