/cuberite

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix item durability. #1236

Merged
merged 4 commits into from Jul 27, 2014

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@Howaner @madmaxoft @tigerw
@Howaner
Contributor

Howaner commented Jul 23, 2014

Fixes #1181
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Jul 23, 2014

Member

Somewhat unfortunate naming. How about eDurabilityLostAction and GetDurabilityLossByAction()?
Also, rebase your branch onto current master.
Member

madmaxoft commented Jul 23, 2014

Somewhat unfortunate naming. How about eDurabilityLostAction and GetDurabilityLossByAction()?
Also, rebase your branch onto current master.

Howaner added some commits Jul 26, 2014

@Howaner
Merge branch 'master' into Inventory2 
Conflicts:
	src/BlockInfo.cpp
Loading status checks…
ba36e79
@Howaner
Rename function.
Loading status checks…
4de8f5c
@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Jul 26, 2014

Contributor

done.
Contributor

Howaner commented Jul 26, 2014

done.
@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Jul 26, 2014

Contributor

Build failed? I hate AppVeyor ...
Contributor

Howaner commented Jul 26, 2014

Build failed? I hate AppVeyor ...
src/Blocks/BlockLeaves.h
@@ -61,22 +61,6 @@ class cBlockLeavesHandler :
}
}
}
void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Jul 26, 2014

Member

Just to confirm that removing apple drops was intentional?
Copy link
@tigerw

tigerw Jul 26, 2014

Member

Just to confirm that removing apple drops was intentional?

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Jul 26, 2014

Contributor

The apple drop is already in ConvertToPickups(), isn't it?
Copy link
@Howaner

Howaner Jul 26, 2014

Contributor

The apple drop is already in ConvertToPickups(), isn't it?

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Jul 26, 2014

Member

I'm not sure, this function may be needed for the apple drops when the leaves decay on their own, not being destroyed by player. Can you test that?
Copy link
@madmaxoft

madmaxoft Jul 26, 2014

Member

I'm not sure, this function may be needed for the apple drops when the leaves decay on their own, not being destroyed by player. Can you test that?

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Jul 27, 2014

Contributor

It works.
Copy link
@Howaner

Howaner Jul 27, 2014

Contributor

It works.
@tigerw

This comment has been minimized.

Show comment
Hide comment
@tigerw

tigerw Jul 26, 2014

Member

I think it gave an error, see: https://ci.appveyor.com/project/madmaxoft/mcserver/build/1.0.465/messages
Member

tigerw commented Jul 26, 2014

I think it gave an error, see: https://ci.appveyor.com/project/madmaxoft/mcserver/build/1.0.465/messages
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Jul 26, 2014

Member

Of course it gave an error, you need to rename all instances of the function.
Member

madmaxoft commented Jul 26, 2014

Of course it gave an error, you need to rename all instances of the function.
@Howaner
Derp.
Loading status checks…
c2a2aea
@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Jul 26, 2014

Contributor

Oh, i forgot to rename the override in ItemHoe.h
Now it works.
Contributor

Howaner commented Jul 26, 2014

Oh, i forgot to rename the override in ItemHoe.h
Now it works.
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft Jul 26, 2014

Member

So did you even compile after the changes? And how about testing?
Member

madmaxoft commented Jul 26, 2014

So did you even compile after the changes? And how about testing?
@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Jul 26, 2014

Contributor

Yes. I tested and compiled it, but g++ didn't give me a error in ItemHoe.h.
Contributor

Howaner commented Jul 26, 2014

Yes. I tested and compiled it, but g++ didn't give me a error in ItemHoe.h.
@Howaner

This comment has been minimized.

Show comment
Hide comment
@Howaner

Howaner Jul 27, 2014

Contributor

Merge?
Contributor

Howaner commented Jul 27, 2014

Merge?

madmaxoft added a commit that referenced this pull request Jul 27, 2014

@madmaxoft
Merge pull request #1236 from Howaner/Inventory2 
Fix item durability.
Loading status checks…
0814a97

@madmaxoft madmaxoft merged commit 0814a97 into cuberite:master Jul 27, 2014
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/travis-ci The Travis CI build failed
Details
continuous-integration/appveyor AppVeyor build succeeded
Details

@Howaner Howaner deleted the Howaner:Inventory2 branch Aug 5, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment