Fix server startup, jar building and after-merge fixes.
This commit is contained in:
@@ -195,7 +195,7 @@ public final class AppEngClient extends AppEngBase {
|
||||
// On the client, we'll register for server startup/shutdown to properly setup
|
||||
// WorldData
|
||||
// each time the integrated server starts&stops
|
||||
ServerLifecycleEvents.SERVER_STARTED.register(WorldData::onServerStarting);
|
||||
ServerLifecycleEvents.SERVER_STARTING.register(WorldData::onServerStarting);
|
||||
ServerLifecycleEvents.SERVER_STOPPING.register(server -> WorldData.instance().onServerStopping());
|
||||
ServerLifecycleEvents.SERVER_STOPPED.register(server -> WorldData.instance().onServerStoppped());
|
||||
|
||||
|
||||
@@ -68,12 +68,6 @@ public class FacadeBlockAccess implements BlockRenderView {
|
||||
return world.getFluidState(pos);
|
||||
}
|
||||
|
||||
// This is for diffuse lighting
|
||||
@Override
|
||||
public float func_230487_a_(Direction p_230487_1_, boolean p_230487_2_) {
|
||||
return world.func_230487_a_(p_230487_1_, p_230487_2_);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LightingProvider getLightingProvider() {
|
||||
return world.getLightingProvider();
|
||||
|
||||
Reference in New Issue
Block a user