Implement new Wrapper Events #241
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
ExE-Boss
added
minecraft 1.7
RX14
added
the
in progress
Codecov Report
@@ Coverage Diff @@
## master #241 +/- ##
===========================================
- Coverage 13.65% 13.5% -0.16%
Complexity 652 652
===========================================
Files 395 395
Lines 11387 11516 +129
Branches 1246 1246
===========================================
Hits 1555 1555
- Misses 9734 9863 +129
Partials 98 98
Continue to review full report at Codecov.
|
ExE-Boss
force-pushed
the
wrapper-events-2
branch
from
5ba8a5d to
efd1587
Compare
ExE-Boss
force-pushed
the
wrapper-events-2
branch
from
efd1587 to
1dcb7f1
Compare
ExE-Boss
added
ready
RX14
suggested changes
Feb 12, 2017
| @@ -64,6 +66,10 @@ public void damage(double amount, DamageType type) { | |||
| living.faceDisplacement = () -> Vector3D.PLUS_J.scalarMultiply(entity.getEyeHeight()); | |||
| } | |||
| } | |||
| if (entity != null) { | |||
There was a problem hiding this comment.
Would entity being null break the rest of the code?
There was a problem hiding this comment.
That was done because of BWEntityFX, but I have a better fix for that now.
There was a problem hiding this comment.
This line wouldn’t have prevented a NPE anyway, as that would have been thrown already
| FWTile tile = (block instanceof Updater) ? updaterInjector.inject(block, new Class[] { String.class }, new Object[] { blockID }) : injector.inject(block, new Class[] { | ||
| String.class }, new Object[] { blockID }); | ||
| FWTile tile = (block instanceof Updater) ? updaterInjector.inject(block, new Class[] { String.class }, new Object[] { blockID }) : | ||
| injector.inject(block, new Class[] { String.class }, new Object[] { blockID }); |
There was a problem hiding this comment.
This ternary expression is pretty long, why not do this:
ComponentInjector<FWTile> injector = (block instanceof Updater) ? updaterInjector : injector;
injector.inject(block, new Class[] { String.class }, new Object[] { blockID });| @@ -64,6 +66,10 @@ public void damage(double amount, DamageType type) { | |||
| living.faceDisplacement = () -> Vector3D.PLUS_J.scalarMultiply(entity.getEyeHeight()); | |||
| } | |||
| } | |||
| if (entity != null) { | |||
ExE-Boss
force-pushed
the
wrapper-events-2
branch
from
1dcb7f1 to
478c075
Compare
RX14
approved these changes
Feb 12, 2017
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.
Needed for wrappers to add wrapper-specific Components to backward wrappers.
For 1.9+: Needed for wrappers to add wrapper-specific Forge Capabilities (Forge’s equivalent of NOVA Components) to forward wrappers (eg. NOVA-Team/NOVA-Energy#4).
Split off from #235