search

Civcraft / Citadel

Do not open issues here; open them on the maintained fork @ DevotedMC
https://github.com/DevotedMC/Citadel
BSD 3-Clause "New" or "Revised" License
6 stars 23 forks source link

Fixing some ghost blocks #142

Closed ProgrammerDan closed 8 years ago

ProgrammerDan commented 8 years ago

Cleaning up some code that can cause "ghost" reinforcements.

CivcraftBot commented 8 years ago

Can one of the admins verify this patch? Type 'ok to test' to test.

ProgrammerDan commented 8 years ago

@Erocs Should be better, thanks for the suggestion.

@Rourke750 indicates there's another area to fix; I'll catch that in a pull later as it will require further testing.

ProgrammerDan commented 8 years ago

Build is on civtest.

ProgrammerDan commented 8 years ago

LOL, oh man. I need to start sleeping again.

erocs commented 8 years ago

Sleep is for the weak, or at least that's what I tell myself every morning at 4.

ProgrammerDan commented 8 years ago

With some luck, perhaps that did it. Man, batting 1000 today.

erocs commented 8 years ago

Seems legit.

ProgrammerDan commented 8 years ago

weird that clahub is complaining, definitely signed it. In any case, it's up on civtest (x3)

ProgrammerDan commented 8 years ago

initial testing indicates the fix is good.

@ttk2 your discretion, can stage this fix now or wait for me to investigate the other bit Rourke wants; that might take longer.

rourke750 commented 8 years ago

Ttk u can stage.

erocs commented 8 years ago

Staged

erocs commented 8 years ago

http://build.civcraft.co/job/Citadel-master/192/artifact/target/Citadel-3.3.5.jar

ttk2 commented 8 years ago

oh hey this is whats causing restart to hang

On Thu, Nov 12, 2015 at 8:28 PM, erocs notifications@github.com wrote:

http://build.civcraft.co/job/Citadel-master/192/artifact/target/Citadel-3.3.5.jar

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/Citadel/pull/142#issuecomment-156302256.

ProgrammerDan commented 8 years ago

That doesn't make sense. This code change is 100% passive and only impacts the execution of /ctacid -- nothing else, no database changes, and it definitely doesn't check for Ghost blocks.

So unless there's another upstream patch that went out, this patch for sure isn't causing the hang.