From 193ea92b600a47012c653b77c0cef62a2f2bb201 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Mon, 23 Nov 2015 03:07:12 -1000 Subject: [PATCH] Fix Vanilla name<->state mappings not being overridden by FML ones correctly --- src/mceditlib/anvil/adapter.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mceditlib/anvil/adapter.py b/src/mceditlib/anvil/adapter.py index f2da475..9cb53a3 100644 --- a/src/mceditlib/anvil/adapter.py +++ b/src/mceditlib/anvil/adapter.py @@ -586,6 +586,11 @@ class AnvilWorldAdapter(object): vanillaNameAndState = blocktypes.statesByID.get((ID, vanillaMeta)) blocktypes.blockJsons.pop(vanillaNameAndState, None) + # Also remove Vanilla name<->state mapping + blocktypes.IDsByState.pop(vanillaNameAndState, None) + vanillaName = blocktypes.namesByID.get(ID) + blocktypes.IDsByName.pop(vanillaName, None) + blocktypes.defaultBlockstates.pop(vanillaName, None) blocktypes.IDsByState[nameAndState] = ID, 0 blocktypes.statesByID[ID, 0] = nameAndState