search

Civcraft / PrisonPearl

Minecraft plugin for civcraft which allows players to imprison other players inside ender pearls
BSD 3-Clause "New" or "Revised" License
4 stars 16 forks source link

Issue fixes for #10, #12, and #14. #16

Closed Ty4Code closed 9 years ago

Ty4Code commented 9 years ago

Copied from another issue comment:

I've made a commit that should fix issues #14, #12, and #10.

It also includes a (nearly) complete fix for issue #15 which would cancel pearl expiration due to chunk unloading even after the chunk is loaded. However, there appears to be an odd bug where chunk.getEntities() from ChunkLoadEvent does not containg the prison pearl entity in the chunk (though it does contain other non-prison pearl enderpearls). I spent an hour trying to debug and figure out what was going on but have to get off for the moment. If anyone has any idea why that could be happening, I'd love to hear it.

I'll make a pull request from my fork, though if I submit it incorrectly, feel free to let me know.

WildWeazel commented 9 years ago

woah, merge gore

Ty4Code commented 9 years ago

Haha yeah, my fork was a year+ old, and I wasn't able to delete and re-fork without contacting GitHub admins and asking manually so I followed Rourke's advice and just committed the entire current state of the project to update.

ttk2 commented 9 years ago

that's a terrible way to do things.

Ty4Code commented 9 years ago

Do you have any recommendations for a better way to bring my fork up to the present state?

ttk2 commented 9 years ago

not much of a git expert, but we would really rather have our own repo with your changes than your repo.

On Mon, Nov 17, 2014 at 4:57 PM, MrTwiggy notifications@github.com wrote:

Do you have any recommendations for a better way to bring my fork up to the present state?

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/PrisonPearl/pull/16#issuecomment-63392603.

Ty4Code commented 9 years ago

I'm not sure if I can commit changes directly to Civcraft/PrisonPearl as it requires special write access, so it seemed the only way is to commit to a personal fork and then PR it to Civcraft/PrisonPearl. I think, at least.

WildWeazel commented 9 years ago

I'm pretty sure git allows you to merge/pull individual commits instead of a whole branch, you just have to use a client.

rourke750 commented 9 years ago

@MrTwiggy For your chunkloading I can't remember why but I know that you can't listen to the chunkloadevent. That's why it was the playerpickup instead.

rourke750 commented 9 years ago

@MrTwiggy I also sent you a pull request to fix your repo to our standards. Merge it using the command line and readd your code.

Also thx a ton this is a huge help.

rourke750 commented 9 years ago

Yay fixing.

rourke750 commented 9 years ago

Looks good thx a ton for doing this.