mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-03-22 18:18:12 +05:00
88798b501d
* Sync keyboard text buffer from Flash before processing physical input The native keyboard scene maintained a separate C++ buffer (m_win64TextBuffer) for physical keyboard input, which was pushed to the Flash text field via setLabel(). However, when the user typed with the on-screen controller buttons, Flash updated its text field directly through ActionScript without updating the C++ buffer. This caused a desync: switching back to the physical keyboard would overwrite any text entered via controller, since m_win64TextBuffer still held the old value before the controller edits. Fix: read the current Flash text field into m_win64TextBuffer at the start of each tick(), before consuming new physical keyboard chars. This ensures both input methods always operate on the same state. * Use last active input device to decide keyboard mode instead of connection state The keyboard UI mode (on-screen virtual keyboard vs direct text input) was determined by Win64_IsControllerConnected(), which checks if any XInput controller is physically plugged in. This meant that even if the player was actively using mouse and keyboard, the virtual keyboard would still appear as long as a controller was connected. Replace the connection check with g_KBMInput.IsKBMActive(), which tracks the actual last-used input device based on per-frame input detection. Now the keyboard mode is determined by what the player is currently using, not what hardware happens to be plugged in. Affected scenes: CreateWorldMenu (world naming) and LoadOrJoinMenu (world renaming). * Fix TextInput caret behavior and add proper cursor editing for KBM direct edit The direct text editing mode introduced for KBM users had several issues with the TextInput control's caret (blinking cursor) and text manipulation: 1. Caret visible when not editing: When navigating to the world name field with keyboard/mouse, Flash's Iggy focus system would show the blinking caret even though the field wasn't active for editing yet (Enter not pressed). This was misleading since typing had no effect in that state. Fix: access the FJ_TextInput's internal m_mcCaret MovieClip and force its visibility based on editing state. This is enforced every tick because setLabel() and Flash focus transitions continuously reset the caret state. 2. No cursor movement during editing: The direct edit implementation treated the text as a simple buffer with push_back/pop_back — there was no concept of cursor position. Backspace only deleted from the end, and arrow keys did nothing. Fix: track cursor position (m_iCursorPos) in C++ and use wstring insert/erase at that position. Arrow keys (Left/Right), Home, End, and Delete now work as expected. The visual caret position is synced to Flash via the FJ_TextInput's SetCaretIndex method. 3. setLabel() resetting caret position: Every call to setLabel() (when text changes) caused Flash to reset the caret to the end of the string, making the cursor jump visually even though the C++ position was correct. Fix: enforce caret position via setCaretIndex every tick during editing, so any Flash-side resets are immediately corrected. New UIControl_TextInput API: - setCaretVisible(bool): toggles m_mcCaret.visible in Flash - setCaretIndex(int): calls FJ_TextInput.SetCaretIndex in Flash * Fix keyboard/arrow navigation not working when no UI element is focused On Windows64 with KBM, moving the mouse over empty space (outside any button) would clear the Iggy focus entirely. After that, pressing arrow keys did nothing because Flash had no starting element to navigate from. Two changes here: - Don't set focus to IGGY_FOCUS_NULL when the mouse hovers over empty space. The previous hover target stays focused, so switching back to arrows keeps working seamlessly. - When a navigation key is pressed and nothing is focused at all (e.g. mouse was already on empty space when the menu opened), grab the first focusable element instead of silently dropping the input. The keypress is consumed to avoid jumping two elements at once. This makes mixed mouse+keyboard navigation feel a lot more natural. You can point at a button, then continue with arrows, or just start pressing arrows right away without having to hover first. * Overhaul mouse support and generalize direct text editing to all UI scenes This is a large rework of the Windows64 KBM (keyboard+mouse) input layer. It touches the mouse hover system, the mouse click dispatch, and the direct text editing infrastructure, then applies all of it to every scene that has text input fields or non-standard clickable elements. MOUSE HOVER REWRITE (UIController.cpp tickInput) The old hover code had two structural problems: (a) Scene lookup was group-first: it iterated UI groups and checked all layers within each group. The Tooltips layer on eUIGroup_Fullscreen (which holds non-interactive overlays like button hints) would be found before in-game menus on eUIGroup_Player1. The tooltip scene focusable objects captured mouse input and prevented hover from reaching the actual menu. Fixed by switching to layer-first lookup across all groups, and skipping eUILayer_Tooltips entirely since those are never interactive. (b) On tabbed menus (LaunchMoreOptionsMenu Game vs World tabs), all controls from all tabs are registered in Flash at the same time. There was no filtering, so controls from inactive tabs had phantom hitboxes that overlapped the active tab controls, making certain buttons unhoverable. Fixed by introducing parent panel tracking: each UIControl now has a m_pParentPanel pointer, set automatically by the UI_MAP_ELEMENT macro during mapElementsAndNames(). The hover code checks the control parent panel against the scene GetMainPanel() and skips mismatches. This is the same technique the Vita touch code used, but applied to mouse hover. The coordinate conversion was also simplified. The old code had two separate scaling paths (window dimensions for hover, display dimensions for sliders). Now there is one conversion from window pixel coords to SWF coords using the scene own render dimensions. REUSING VITA TOUCH APIs FOR MOUSE (ButtonList, UIScene) Several APIs originally gated behind __PSVITA__ are now enabled for Win64: - UIControl_ButtonList::SetTouchFocus(x,y) and CanTouchTrigger(x,y): the Flash-side ActionScript methods were already registered on all platforms in setupControl(), only the C++ wrappers were ifdef-gated. Opening the ifdefs to include _WINDOWS64 lets the mouse hover code delegate to Flash for list item highlighting, which handles internal scrolling and item layout that would be impractical to replicate in C++. - UIScene::SetFocusToElement(id): programmatic focus-by-control-ID, used as a fallback when Iggy focusable objects do not match the C++ hit test. - UIScene_LaunchMoreOptionsMenu::GetMainPanel(): returns the active tab panel control, needed by the hover code to filter inactive tab controls. MOUSE CLICK DISPATCH (UIScene.cpp handleMouseClick) Left-clicking previously relied entirely on Iggy ACTION_MENU_OK dispatch, which routes to whatever Flash considers focused. This broke for custom- drawn elements that are not Flash buttons (crafting recipe slots), and for scenes where Iggy focus did not match what the user visually clicked. Added a virtual handleMouseClick(x, y) on UIScene with a default implementation that hit-tests C++ controls. When multiple controls report overlapping bounds (common in debug scenes where TextInputs report full Flash-width), it picks the one whose left edge X is closest to the click. Returns true to consume the click and suppress the normal ACTION_MENU_A dispatch via a m_mouseClickConsumedByScene flag on UIController. The default implementation handles buttons, text inputs, and checkboxes (toggling state and calling handleCheckboxToggled directly). CRAFTING MENU MOUSE CLICK (UIScene_CraftingMenu.cpp) The crafting menu recipe slots (H slots) are rendered through Iggy custom draw callback, not as Flash buttons. They have no focusable objects, so mouse clicking did nothing. The solution caches SWF-space positions during rendering: inside customDraw, when H slot 0 and H slot 1 are drawn, the code extracts SWF coordinates from the D3D11 transform matrix via gdraw_D3D11_CalculateCustomDraw_4J. The X difference between slot 0 and slot 1 gives the uniform slot spacing. handleMouseClick then uses these cached bounds to determine which recipe slot was clicked, resets the vertical slot indices (same pattern as the constructor), updates the highlight and vertical slots display, and re-shows the old slot icon. This mirrors the existing controller LEFT/RIGHT navigation in the base class handleKeyDown. DIRECT EDIT REFACTORING (UIControl_TextInput) The direct text editing feature (type directly into text fields instead of opening the virtual keyboard) was originally implemented inline in CreateWorldMenu with all the state, character consumption, cursor tracking, caret visibility, and cooldown logic hardcoded in one scene. Moved everything into UIControl_TextInput: - beginDirectEdit(charLimit): captures current label, inits cursor at end - tickDirectEdit(): consumes chars, handles Backspace/Enter/Escape, arrow keys (Left/Right/Home/End/Delete), enforces caret visibility every tick (because setLabel and Flash focus transitions continuously reset it), returns Confirmed/Cancelled/Continue - cancelDirectEdit() / confirmDirectEdit(): programmatic control - isDirectEditing() / getDirectEditCooldown() / getEditBuffer(): state query For SWFs that lack the m_mcCaret MovieClip child (like AnvilMenu), the existence check validates by reading a property from the resolved path, since IggyValuePathMakeNameRef always succeeds even for undefined refs. When no caret exists, the control inserts a _ character at the cursor position as a visual fallback. The caret check result is cached in m_bHasCaret/m_bCaretChecked to avoid repeated Iggy calls that could corrupt internal state. SCENES UPDATED WITH DIRECT EDIT + VIRTUAL KEYBOARD Every scene with text input now supports both input modes: direct editing when KBM is active, virtual keyboard (via NavigateToScene eUIScene_Keyboard) when using a controller. The mode is chosen at press time based on g_KBMInput.IsKBMActive(). - CreateWorldMenu: refactored to use the new UIControl_TextInput API, removing ~80 lines of inline editing code. - AnvilMenu: item renaming now supports direct edit. The keyboard callback uses Win64_GetKeyboardText instead of InputManager.GetText (which reads from a different buffer on Win64). The virtual keyboard is opened with eUILayer_Fullscreen + eUIGroup_Fullscreen so it does not hide the anvil container menu underneath. Added null guards on getMovie() in setCostLabel and showCross since the AnvilMenu SWF may not fully load on Win64. - SignEntryMenu: all 4 sign lines support direct edit. Clicking a different line while editing confirms the current one. Each line cooldown timer is checked independently to prevent Enter from re-opening the edit. - LaunchMoreOptionsMenu: seed field direct edit with proper input blocking. - DebugCreateSchematic: all 7 text inputs (name + start/end XYZ coords). handleMouseClick is overridden to always consume clicks during edit to prevent Iggy re-entry on empty space. - DebugSetCamera: all 5 inputs (camera XYZ + Y rotation + elevation). Clicking a different field while editing confirms the current value and opens the new one. Float display formatting changed from %f to %.2f. All keyboard completion callbacks on Win64 now use Win64_GetKeyboardText (two params: buffer + size) instead of InputManager.GetText, which reads from the correct g_Win64KeyboardResult global when using the in-game keyboard scene. SCROLL WHEEL Mouse wheel events (ACTION_MENU_OTHER_STICK_UP/DOWN) are now centrally remapped to ACTION_MENU_UP/DOWN in UIController::handleKeyPress when KBM is active. Previously each scene would need to handle OTHER_STICK actions separately, and most did not, so scroll wheel only worked in a few places. * Add mouse click support to CraftingMenu (tab switching, slot selection, craft) The crafting screen's horizontal recipe slots and category tabs are custom-drawn via Iggy callbacks rather than regular Flash buttons, so the standard mouse hover system can't interact with them. This adds handleMouseClick to derive clickable regions from the H slot positions cached during customDraw. Tab clicking: tab hitboxes are computed relative to the H slot row since the Vita TouchPanel overlays (full-screen invisible rectangles) aren't suitable for direct hit-testing on Win64. The Y bounds were tuned empirically to match the SWF tab icon positions. Clicking a tab runs the same switch logic as LB/RB: hide old highlight, update group index, reset slot indices, recalculate recipes, and refresh the display. H slot clicking: clicking a different recipe slot selects it (updating V slots, highlight, and re-showing the previous slot). Clicking the already-selected slot crafts the item by dispatching ACTION_MENU_A through handleKeyDown, reusing the existing crafting path. Empty slots (iCount == 0) are ignored. All mouse clicks on the scene are consumed (return true) to prevent misses from falling through as ACTION_MENU_A and accidentally triggering a craft. This only suppresses mouse-originated A presses via m_mouseClickConsumedByScene; keyboard and controller A remain fully functional. Also enables GetMainPanel for Win64 (was Vita-only) so the mouse hover system can filter controls by active panel, same as other tabbed menus. * Fix mouse hover selecting wrong buttons from the third onward The hover code was doing a redundant second hit-test against Iggy focusable object bounds after the C++ control bounds had already identified the correct control. Iggy focusable bounds are wider than the actual visible buttons and overlap vertically, so the "pick largest x0" heuristic would match focusables belonging to earlier buttons when hovering the right side of buttons 3+. Replaced the IggyPlayerGetFocusableObjects path with a direct SetFocusToElement call using the already-correct hitControlId from the C++ hit-test, same approach the click path uses in handleMouseClick. Also switched the overlap tiebreaker from "largest x0" to smallest area, consistent with how clicks resolve overlapping controls. TextInput is excluded from hover focus to avoid showing the caret on mere mouse-over (its Iggy focus is set on click). * Use smallest-area tiebreaker for mouse click hit-testing too Same overlap fix applied to handleMouseClick: when multiple controls contain the click point, prefer the one with the smallest bounding area instead of the one with the largest left-edge X. This is more robust for any layout (vertical menus, grids, overlapping panels) and matches the hover path logic. Those changes were initially made in order to fix the teleport ui for the mouse but broke every other well working ui. * Fix mouse cursor staying trapped in window on alt-tab When the inventory or other UI with a hidden cursor was open, alt-tabbing out would leave the cursor locked to the game window. SetWindowFocused(false) from WM_KILLFOCUS correctly released the clip and showed the cursor, but Tick() was unconditionally calling SetCursorPos every frame to re-center it, overriding the release. Added m_windowFocused to the Tick() condition so cursor manipulation only happens while the window actually has focus. * Map mouse right click to ACTION_MENU_X for inventory half-stack Right clicking an item stack in Java Edition picks up half of it. Console Edition already handles this via ACTION_MENU_X (the X button on controller), which sets buttonNum=1 in handleKeyDown. This maps mouse right click to that same action so KBM players get the same behavior across all container menus (inventory, chests, furnaces, hoppers, etc). * Fix mouse hover hitting removed controls (ghost hitboxes) When removeControl() removes a Flash element (e.g. the Reinstall button in Help & Options, or the Debug button when disabled), the C++ control object stays in the m_controls vector. On Vita this was handled by calling setHidden(true) and checking getHidden() in the touch hit-test, but on Windows64 none of that was happening. The result: removed buttons kept phantom bounds that the hover code would match against, stealing focus from the buttons that shifted into their visual position. In the Help & Options menu with debug enabled, the removed Reinstall button (Button6) had ghost bounds overlapping where the Debug button (Button7) moved to after the removal, making Debug un-hoverable and snapping focus to Button1. The fix has three parts: - removeControl() now calls setHidden(true) on all platforms, not just Vita. The m_bHidden member was already declared on all platforms, only the accessors were ifdef'd behind __PSVITA__. - Removed the __PSVITA__ ifdef from setHidden/getHidden in UIControl.h so they're available everywhere. - Added getHidden() checks in both the hover and click hit-test loops, matching what the Vita touch code already does. The check is a simple bool read (no Flash/Iggy call), placed before the getVisible() query which hits Flash and can return stale values for removed elements. * Add right-click to open save options in world selection menu On controller, RB (ACTION_MENU_RIGHT_SCROLL) opens the save options dialog (rename/delete) when a save is selected. Mouse right-click maps to ACTION_MENU_X, which had no Windows64 handler in this scene. Added save options handling under ACTION_MENU_X for _WINDOWS64 so right-clicking a save opens the same dialog. Also handles the mashup world hide action for right-click consistency. Console-only options (copy save, save transfer) are excluded since they don't apply here. * Fix splitscreen mouse, keyboard cursor, and local player join Mouse hover and click in split-screen was broken: the coordinate conversion from window pixels to Flash/SWF space did not account for the viewport tile-origin offset or the smaller display dimensions of each splitscreen quadrant. Now the mouse position is mapped through three steps: window pixels to UIController screen space, subtract the viewport origin (which varies per quadrant/split type), then scale from display size to SWF authoring size. This fixes hover highlighting and click targeting in all splitscreen layouts. Mouse input was also bleeding into other splitscreen players' UI groups because the scene lookup iterated all groups. Now it only checks the fullscreen group and the primary (KBM) player's group, so controller players' menus are never affected by mouse movement. Mouse grab/release (cursor lock for gameplay) was triggering for every local player's tick, causing fights between splitscreen players over the cursor state. Now only the primary pad player controls grab state. The in-game keyboard scene in PC mode had no cursor movement: typing always appended at the end and backspace always deleted from the end. Added a cursor position tracker (m_iCursorPos) so that characters are inserted at the cursor, backspace deletes behind it, and arrow keys, Home, End, and Delete all work as expected. The Flash caret is synced to the cursor position each tick. Also stopped syncing the text buffer back from Flash in PC mode, which was resetting the cursor every tick. Arrow keys in PC mode no longer get forwarded to Flash (which would move the on-screen keyboard selector instead of the text cursor). AddLocalPlayerByUserIndex was calling NotifyPlayerJoined before the IQNet slot was actually registered, passing a pointer obtained via GetLocalPlayerByUserIndex which checks customData (not set yet at that point). Now AddLocalPlayerByUserIndex is called first, and if it succeeds, the notification uses the static m_player array directly. The stub AddLocalPlayerByUserIndex now properly initialises the slot with gamertag and remote/host flags instead of being a no-op. IsSignedIn was hardcoded to return true only for pad 0, preventing splitscreen players from joining. Now it checks IsPadConnected so any connected controller can sign in. GetXUID returned INVALID_XUID for all pads except 0, which broke splitscreen player identity. Now each pad gets a unique XUID derived from the base value plus the pad index. Pinned internal resolution to 1920x1080 and removed GetSystemMetrics auto-detection which was picking up the native monitor resolution and breaking the 16:9 assumption in the viewport math and Flash layout. DPI awareness is kept for consistent pixel coordinates. * Fix Escape key not opening pause menu during tutorial hints The KBM pause check had a IsTutorialVisible guard that blocked Escape entirely while any tutorial popup was on screen. The controller path never had this restriction. Removed the check so Escape behaves the same as Start on controller. * Fix crash in WriteHeader when save buffer is too small for header table When a player enters a new region, RegionFile's constructor calls createFile which adds a FileEntry with length 0 to the file table. This increases the header table size (appended at the end of the save buffer) by sizeof(FileEntrySaveData) per entry, but since no actual data is written to the file, MoveDataBeyond is never called and the committed virtual memory pages are never grown to match. On the next autosave tick, saveLevelData writes level.dat first (before chunkSource->save which would have grown the buffer). If level.dat doesn't need to grow, finalizeWrite calls WriteHeader which tries to memcpy the now-larger header table past the end of committed memory, causing an access violation. This is especially likely in splitscreen where two players exploring at the same time can create multiple new RegionFile entries within a single tick, quickly exhausting the page-alignment slack in the buffer (yes i am working at splitscreen in the meanwhile :) ) The fix was deduced by tracing the crash callstack through the save system: FileHeader, ConsoleSaveFileOriginal, the stream chain, and the RegionFile/RegionFileCache layer. The root cause turned out to be a gap between createFile (which grows the header table) and MoveDataBeyond (the only place that grows the buffer), with finalizeWrite sitting right in between unprotected. The buffer growth check added here mirrors the exact same VirtualAlloc pattern already used in MoveDataBeyond (line 484-497) and in the constructor's decompression path (line 176-190), so it integrates naturally with the existing code. Same types, same page rounding, same error handling. The fast path (no new entries, buffer already big enough) is a single DWORD comparison that doesn't get taken, so there is zero overhead in the common case. This is the right place for the fix because finalizeWrite is the sole caller of WriteHeader, meaning every code path that writes the header (closeHandle, PrepareForWrite, deleteFile, Flush) is now protected by a single check point. * Fix TextInput bugs and refactor direct edit handling into UIScene base class The fake cursor character (_) used for SWFs without m_mcCaret was leaking into saved sign and anvil text. This happened because setLabel() with instant=false only updates the C++-side cache, deferring the Flash write to the next control tick. Any getLabel() call before that tick reads the old Flash value still containing the underscore. Fixed by passing instant=true in confirmDirectEdit, cancelDirectEdit, and the Enter key path inside tickDirectEdit, so the cleaned text hits Flash immediately. Mouse hover over TextInput controls (world name, anvil name, seed field) was not showing the yellow highlight border. The hover code used IggyPlayerSetFocusRS which sets Iggy's internal dispatch focus but does not trigger Flash's ChangeState callback, so no visual feedback appeared. Buttons worked fine because Iggy draws its own focus ring on them, but TextInput relies entirely on ChangeState(0) for the yellow border. Switched to SetFocusToElement which goes through the Flash-side SetFocus path, then immediately call setCaretVisible(false) to suppress the blinking caret that comes with focus. No visual flicker since rendering happens after both tickInput and scene tick complete. While direct editing, mouse hover was able to move focus away to other TextInputs on the same scene (most noticeably on the sign editor, where hovering a different line would steal focus from the line being typed). Added an isDirectEditBlocking() check in the hover path to skip focus changes when any input on the scene is actively being edited. The Done button in SignEntryMenu was unresponsive to mouse clicks during direct editing. The root cause is execution order: handleMouseClick runs before handleInput in the frame. The base handleMouseClick found the Done button and called handlePress, but handlePress bailed out because of the isDirectEditing guard. The click was marked consumed, so handleInput never saw it. Fixed by overriding handleMouseClick in SignEntryMenu to detect the Done button hit while editing and confirm + close directly. Added click-outside-to-deselect for anvil and world name text inputs. Both scenes previously required Enter to confirm the edit, which felt wrong. Now clicking anywhere outside the text field bounds confirms the current text, matching standard UI behavior. The anvil menu now updates the item name in real time while typing, like Java edition. Previously the name was only applied on Enter, so the repair cost display was stale until confirmation. The biggest change is structural: every scene that used direct editing (AnvilMenu, CreateWorldMenu, SignEntryMenu, LaunchMoreOptionsMenu, DebugCreateSchematic, DebugSetCamera) had its own copy of the same boilerplate -- tickDirectEdit loops in tick(), click-outside hit testing in handleMouseClick(), cooldown guard checks in handleInput/handlePress, and result dispatch with switch/if chains. This was around 200 lines of near-identical code scattered across 6 files, each with its own slight variations and its own bugs waiting to happen. Pulled all of it into UIScene with two virtual methods: getDirectEditInputs() where scenes register their text inputs, and onDirectEditFinished() where they handle confirmed/cancelled results. The base class tick() drives tickDirectEdit on all registered inputs, handleMouseClick() does the click-outside-to-deselect hit test generically using panel offsets, and isDirectEditBlocking() replaces all the inline cooldown checks. Scenes now just override those two methods and get everything for free. Also removed the m_activeDirectEditControl enum tracking from the debug scenes (DebugCreateSchematic, DebugSetCamera) since the base class handles lifecycle tracking through the controls themselves. * Remap scroll wheel to LEFT/RIGHT for horizontal controls The scroll wheel was always remapped to UP/DOWN, which is fine for vertical lists but useless on horizontal controls like sliders and the texture pack selector. Track whether the mouse is hovering a horizontal control during the hover hit-test (new bool m_bMouseHoverHorizontalList, set for eTexturePackList and eSlider). When the flag is set, handleKeyPress emits LEFT/RIGHT instead of UP/DOWN for wheel events. TexturePackList is also now part of the mouse hover system with proper hit-testing, relative-coord SetTouchFocus and GetRealHeight for accurate bounds. * Guard setCaretVisible and setCaretIndex against null movie tickDirectEdit calls into Iggy every tick without checking if the movie is still valid, which crashes inside iggy_w64.dll when the Flash movie gets unloaded or isn't ready yet. * Fix creative inventory scroll for both mouse wheel and controller The mouse scroll wheel was not working in the creative inventory at all. UIController remaps wheel input from OTHER_STICK to UP/DOWN for KBM users, but the base container menu handler consumed UP/DOWN for grid navigation before it could reach the creative menu's page scrolling logic in handleAdditionalKeyPress. Fixed by detecting scroll wheel input on UP/DOWN in the base handler and forwarding it as OTHER_STICK to handleAdditionalKeyPress instead. Also fixed the controller right stick scrolling way too fast: it was jumping TabSpec::rows (5) rows per tick at 100ms repeat rate, which blew through the entire item list almost instantly. Reduced to 1 row per tick so scrolling feels controlled on both input methods. * Fix split-screen world rendering aspect ratio gluPerspective was hardcoded to use g_iAspectRatio (always 16:9) instead of the aspect parameter from getFovAndAspect, which adjusts for split-screen viewports. The 3D world was horizontally stretched in top/bottom split because the projection used 16:9 while the viewport was 32:9. * Split-screen UI system with full ultrawide and multi-aspect-ratio support Screen resolution is now auto-detected from the monitor at startup instead of being hardcoded to 1920x1080. This fixes rendering on ultrawide (21:9), super-ultrawide (32:9), 16:10, and any other aspect ratio -- both in singleplayer and split-screen multiplayer. The 3D world renders at native resolution so the full monitor is used. Flash UI is 16:9-fitted and centered inside each viewport, pillarboxed on wide displays and letterboxed on tall ones. Logical game dimensions (used for ortho projection and HUD layout) are computed proportionally from the real screen aspect ratio, fixing the stretched world projection and HUD that the old hardcoded 1280x720 caused on non-16:9 monitors. GameRenderer::ComputeViewportForPlayer uses the actual backbuffer size instead of the logical game size, which was causing split-screen viewports to be sized incorrectly. UIScene::render fits menus to 16:9 within each split viewport using GetViewportRect + Fit16x9, keeping inventory/crafting/options screens at their designed aspect ratio instead of stretching. Panorama and MenuBackground render at full viewport size with proper tile scaling so the background fills the entire area without gaps in vertical split and quadrant layouts. HUD tile rendering uses ComputeTileScale to uniformly scale the SWF and show the bottom portion (hotbar, hearts, hunger) in horizontal and quadrant splits. repositionHud passes visible SWF-space dimensions to ActionScript for proper element centering within each viewport. Chat and Tooltips overlays use ComputeTileScale and ComputeSplitContentOffset to anchor correctly to the bottom of each player's viewport tile. Container menus apply Fit16x9 to pointer coordinate mapping so the cursor tracks correctly in split-screen. getMouseToSWFScale moved out of the header into the .cpp. Mouse input in onMouseTick is gated to pad 0 since raw mouse deltas should only drive player 1. All shared viewport math lives in UISplitScreenHelpers.h: - GetViewportRect: origin and dimensions for any viewport type - Fit16x9: aspect-correct fitting with centering offsets - ComputeTileScale: uniform scale and Y-offset for tile rendering - ComputeSplitContentOffset: content centering for overlay components * Fix XUID assignment for split-screen local players Main's XUID refactor returned INVALID_XUID for pad != 0, which breaks split-screen because each local player needs a distinct identity for the save system and per-player inventory data. Now pad 1-3 get unique XUIDs derived from the legacy embedded base (base + iPad), same as the original console behavior. Only pad 0 uses the persistent uid.dat-backed XUID for networking. * Use persistent XUID for all pads in GetXUID All pads now get unique XUIDs derived from the persistent uid.dat value (base + iPad offset). This gives each split-screen player a globally unique identity that works for both local play and online multiplayer. The host legacy XUID override for save compatibility still happens in Minecraft.cpp after GetXUID is called, so old worlds are unaffected. * Split-screen networking, window resize, bitmap font fix, and multiplayer stability Adds the networking layer for non-host split-screen multiplayer, implements live window resize with swap chain recreation, fixes bitmap font scaling at small window sizes, and fixes several crash-causing bugs in the multiplayer stack (compression buffer overflow, TCP stream desync, chunk visibility race, CompressedTileStorage torn reads, reconnect stability). == Non-host split-screen multiplayer == Each split-screen pad on a non-host client opens its own TCP connection to the host. From the host's perspective each connection looks like a normal remote player (gets its own smallId, Socket, PlayerConnection). WinsockNetLayer: JoinSplitScreen(), CloseSplitScreenConnection(), SplitScreenRecvThreadProc, per-pad socket/thread/smallId tracking (s_splitScreenSocket[], s_splitScreenSmallId[], s_splitScreenRecvThread[]). GetLocalSocket() returns the correct TCP socket for a given local sender's smallId. GetSplitScreenSmallId() returns the host-assigned smallId for a pad. GameNetworkManager::CreateSocket: non-host path (localPlayer && !IsHost() && IsInGameplay()) calls JoinSplitScreen, sets the IQNet slot's smallId and resolvedXuid, creates a non-hostLocal Socket + ClientConnection, sends PreLoginPacket, registers via addPendingLocalConnection. PlatformNetworkManagerStub::RemoveLocalPlayerByUserIndex: implemented the formerly-empty stub. Calls NotifyPlayerLeaving, CloseSplitScreenConnection, and clears the IQNet slot fields so the pad can rejoin cleanly. SmallId pool: s_nextSmallId starts at XUSER_MAX_COUNT (4), reserving m_player[0-3] for local pads so remote players never collide. IQNetPlayer::SendData: non-host local senders now route through GetLocalSocket(m_smallId) instead of always using SendToSmallId. IQNet::GetLocalPlayerByUserIndex: rewritten. Pad 0 on non-host uses GetLocalSmallId() for direct lookup; pads 1-3 check m_player[padIdx]. C_4JProfile::IsSignedIn: pad 0 always returns true (was checking controller connection, which is unreliable on Win64). GetGamertag/GetDisplayName: for pads 1-3 with active local players, returns the pad-specific gamertag from IQNet::m_player instead of always returning the primary username. ClientConnection: isPrimaryConnection() (true on host or for the primary pad on non-host) guards relative-delta and world-modifying handlers to prevent double-processing of shared state: - Guarded: handleMoveEntity, handleMoveEntitySmall, handleChunkTilesUpdate, handleBlockRegionUpdate, handleTileUpdate, handleTakeItemEntity, handleSignUpdate, handleTileEntityData, handleTileEvent, handleTileDestruction, handleComplexItemData, handleLevelEvent, handleSoundEvent, handleParticleEvent, handleAddGlobalEntity. - handleSetEntityMotion: secondary connections only accept motion targeting their own local player (knockback). - handleExplosion: world modification (finalizeExplosion) guarded, per-player knockback unguarded. Added null check on localplayers[]. - Entity spawn/remove/teleport/data handlers left unguarded (putEntity is idempotent, absolute value setters). handleLogin: added else clause to set level when the dimension already exists (was leaving level NULL on reconnect). handleChunkVisibilityArea/handleChunkVisibility: added null check on level. handleContainerOpen: added null check on localplayers[m_userIndex]. == Reconnect stability == PendingConnection: duplicate XUID no longer rejects with eDisconnect_Banned. Instead it force-disconnects the stale old connection via stalePlayer->connection->disconnect(), queues the old smallId for recycling via queueSmallIdForRecycle(), then calls handleAcceptedLogin for the new connection. MinecraftServer: swapped tick order so players->tick() (disconnect queue) runs before connection->tick() (new logins). The old player is removed from PlayerList before the new LoginPacket's XUID check runs. PlayerList: PushFreeSmallId and ClearSocketForSmallId moved here from DoWork, called only after PlayerConnection::disconnect() completes and the read/write threads are dead. New queueSmallIdForRecycle() method lets PendingConnection push smallIds into m_smallIdsToClose, which PlayerList::tick() processes through closePlayerConnectionBySmallId() for deferred cleanup. Prevents a race where the old write thread could resolve getPlayer() to a recycled smallId's new connection and send stale packets on it. SocketInputStreamLocal::close() and SocketOutputStreamLocal::close() now actually clear their queues (std::swap with empty queue instead of calling .empty() which is a read-only no-op). ServerConnection::stop(): pending and players vectors are snapshot-copied before iterating (prevents iterator invalidation). Remote players receive a DisconnectPacket via disconnect(eDisconnect_Quitting) instead of raw close(). tick(): added else clause so flush() only runs on live connections. WinsockNetLayer::Shutdown(): accept thread stopped first (prevents new recv threads from spawning), then all recv threads are collected and waited on, then connections are closed and split-screen sockets cleaned up. Clears disconnect and free-pool vectors before deleting critical sections. WinsockNetLayer::JoinGame(): waits for old s_clientRecvThread to fully exit before creating a new TCP connection. Prevents the old recv thread from reading bytes off the new socket and desynchronizing the stream. == Compression buffer overflow == CompressLZXRLE and CompressRLE wrote RLE intermediate output into a fixed 100KB buffer with no bounds checking. Full chunk columns are ~160KB and the RLE step can expand 0xFF bytes to 2 bytes each, easily overflowing into rleDecompressBuf and heap metadata. This caused delayed crashes in unrelated code (Packet::readPacket, LevelRenderer::updateDirtyChunks) after the first autosave, since that's when full chunks get compressed. Fix: dynamic allocation when worst-case RLE output (SrcSize * 2) exceeds the static buffer. Static buffer still used for small inputs (zero overhead). CompressRLE: moved LeaveCriticalSection after dynamic buffer cleanup. DecompressLZXRLE: now checks zlib return value (was completely ignored). On failure, bails out immediately with *pDestSize = 0. Added RLE input bounds checking (pucIn >= pucEnd before reading count/data bytes) and output bounds checking (pucOut + count > pucOutEnd). Same bounds checks applied to DecompressRLE. == Stream desync (Connection write thread) == The write thread had two output paths to the same TCP socket: bufferedDos (5KB buffered stream) and direct sos->writeWithFlags(). Chunk data sent via queueSend() used the direct path with shouldDelay=true, while other packets used bufferedDos. If bufferedDos had unflushed bytes, the direct write arrived at the client first, reordering the TCP stream and producing bad packet ID crashes. Fix: flush bufferedDos immediately before every direct sos->writeWithFlags(). == Chunk visibility race (empty first chunk after 30s) == BlockRegionUpdatePacket (direct socket write via queueSend) could arrive at the client before ChunkVisibilityAreaPacket (buffered). The client called getChunk() on a chunk that didn't exist yet in the cache, got EmptyLevelChunk (whose setBlocksAndData is a no-op), and silently lost the block data. On superflat this left one invisible chunk; on normal worlds it crashed the renderer. Fix: handleBlockRegionUpdate calls dimensionLevel->setChunkVisible() for full-chunk BRUPs before writing data, making it independent of packet ordering. Added post-write verification logging. CompressedTileStorage race: get() reads indicesAndData twice without a lock. compress() can swap the pointer between reads, producing indices from the old buffer paired with data from the new buffer. Fix: snapshot indicesAndData into a local variable before deriving both pointers. Same snapshot pattern applied to getData() (non-Vita path), isRenderChunkEmpty(), getHighestNonEmptyY(), getAllocatedSize(), and write(). All methods now also guard against NULL snapshots. == Window resize == ResizeD3D() destroys the old swap chain, creates a new one at the target size, then patches InternalRenderManager members directly via memory offsets (0x20=swap chain, 0x28=RTV, 0x50=SRV, 0x98=DSV, 0x5138/0x513C= backbuffer width/height). Offset verification cross-checks known pointers (device at 0x10, swap chain at 0x20) before patching. Old RTV/SRV are intentionally leaked (orphaned with the old swap chain) to avoid fighting unknown ref holders in the precompiled RenderManager. The flow: Suspend RenderManager, ClearState+Flush, release views, gdraw_D3D11_PreReset, destroy old swap chain, create new swap chain via IDXGIFactory, patch offsets, recreate RTV/SRV/DSV, rebind render targets, update UIController (updateRenderTargets + updateScreenSize), gdraw_D3D11_PostReset + SetRendertargetSize, IggyFlushInstalledFonts, Resume, PostProcesser::Init. WM_SIZE handling defers resize during window drag (WM_ENTERSIZEMOVE/ WM_EXITSIZEMOVE). Immediate resizes (maximize, programmatic) call ResizeD3D directly. Removed the old UpdateAspectRatio() function. CleanupDevice() was leaking g_pDepthStencilView and g_pDepthStencilBuffer. InitDevice: swap chain BufferUsage now includes DXGI_USAGE_SHADER_INPUT (needed for the SRV created from the backbuffer for CaptureThumbnail). New globals: g_rScreenWidth/g_rScreenHeight (real window dimensions, updated on resize) vs g_iScreenWidth/g_iScreenHeight (fixed logical resolution, stays 1920x1080). ComputeViewportForPlayer and getFovAndAspect now use g_rScreenWidth/ g_rScreenHeight instead of the fixed startup values, so 3D perspective and split-screen viewports adapt to window size. Main loop: rendering skipped when window is minimized (IsIconic check) to avoid 100% GPU usage on a hidden swap chain. Windows64_UIController: new updateRenderTargets(rtv, dsv) method updates cached D3D pointers used by gdraw_D3D11_SetTileOrigin every frame. UIController.h: new inline updateScreenSize(w, h) sets m_fScreenWidth/ m_fScreenHeight so all downstream UI code picks up the new size. == Bitmap font scaling == At small window sizes, dynamic text (scrollable list items, HowToPlay pages) showed overlapping characters. Static SWF text was unaffected because it uses embedded vector glyphs. Root cause in UIBitmapFont.cpp GetGlyphBitmap: when display scale is smaller than the bitmap's native scale (pixel_scale < truePixelScale, glyphScale stays at 1), Iggy displayed the glyph at native 1:1 pixel size but advanced the cursor by the smaller display-scale amount. At intermediate window sizes (e.g. 1678x756, scale factor ~0.7), a second bug appeared: some SWF font sizes produced pixel_scale just above truePixelScale (13 for Mojangles_11) while others fell just below, splitting glyphs across the small-display and normal cache branches. The normal branch cached all glyphs in a single [truePixelScale, 99] range, so the first glyph cached set pixel_scale_correct for every subsequent request regardless of font size. Different font sizes then got scaled by wrong ratios (e.g. 18.9/13.3 = 1.42x with point sampling), producing visibly inconsistent letter sizes. This only happened at specific window sizes where the display scale put some fonts above and others below the truePixelScale boundary. Full 1080p and very small windows were unaffected because all fonts landed in the same branch. Fix: on _WINDOWS64, always use pixel_scale_correct = truePixelScale so every cache entry is consistent regardless of which font size creates it first. Two cache ranges: downscale (pixel_scale < truePixelScale) uses bilinear for smooth reduction, upscale uses point_sample for crisp pixel-art rendering. At most two cache entries per glyph. The console code path (fixed resolution, integer-multiple scaling) is preserved behind #else. UIScene.cpp loadMovie: always load 1080.swf on _WINDOWS64 regardless of window size. The old height-based selection could pick 480 or 720 variants which either crashed or loaded the wrong skin library (skinHD.swf vs skin.swf). Display size is now set via Fit16x9 BEFORE the init tick so Iggy's ActionScript text field creation sees the same scale that render() will use. IggyFlushInstalledFonts() called after init tick to clear stale glyph cache entries from previous scenes. Font.cpp addCharacterQuad/renderCharacter: yOff was computed with m_charWidth instead of m_charHeight, producing wrong texture coordinates for non-square glyph cells. This is the world-rendering font (chat, signs, name tags), not the Iggy UI font. == XUID generation == Split-screen pad XUIDs derived by hashing baseXuid + iPad through Mix64 (DeriveXuidForPad in Windows64_Xuid.h) instead of simple addition. Pad 0 returns the base XUID unchanged for save compatibility. Includes validity fallbacks if the hash produces an invalid XUID. (Suggested by rtm516) == Misc == Packet::readPacket: thread-local ring buffer tracks last 8 good packet IDs. On bad packet ID, dumps the history plus next 32 bytes of stream for diagnosing TCP desynchronization. PendingConnection/PlayerList: debug logging for the reconnect flow (duplicate XUID handling, force-disconnect, handleAcceptedLogin, placeNewPlayer with smallId/entityId/dimension). ClientConnection::handleBlockRegionUpdate: warning log when a full chunk arrives with ys==0 (empty full chunk, data loss indicator). == Known issues / future work == SendOnSocket global lock (WinsockNetLayer.cpp): s_sendLock is a single CriticalSection serializing ALL TCP sends across ALL connections. If one client's send() blocks (TCP window full, slow network), every other write thread stalls — no data flows to any player until the slow send completes. Each PlayerConnection has its own write thread, so with 8+ players one slow client can cause latency spikes or timeout disconnects for healthy players. Fix: replace s_sendLock with per-socket locks indexed by smallId. The lock only needs to prevent header+payload interleaving on the SAME socket; sends to different sockets are independent. Deferred to a separate PR to keep this one focused. Textures::releaseTexture: early return for id <= 0, checks TextureGetTexture(id) != NULL before calling glDeleteTextures. Prevents crashes on stale texture IDs after RenderManager reset. UIController TextureSubstitutionDestroyCallback: null guard on Minecraft::GetInstance() and mc->textures before calling releaseTexture. Prevents crash during shutdown. StringTable: removed __debugbreak() on language load failure in debug builds.
2455 lines
76 KiB
C++
2455 lines
76 KiB
C++
#include "stdafx.h"
|
||
//#include "Minecraft.h"
|
||
|
||
#include <ctime>
|
||
|
||
#include "ConsoleInput.h"
|
||
#include "DerivedServerLevel.h"
|
||
#include "DispenserBootstrap.h"
|
||
#include "EntityTracker.h"
|
||
#include "MinecraftServer.h"
|
||
#include "Options.h"
|
||
#include "PlayerList.h"
|
||
#include "ServerChunkCache.h"
|
||
#include "ServerConnection.h"
|
||
#include "ServerLevel.h"
|
||
#include "ServerLevelListener.h"
|
||
#include "Settings.h"
|
||
#include "..\Minecraft.World\Command.h"
|
||
#include "..\Minecraft.World\AABB.h"
|
||
#include "..\Minecraft.World\Vec3.h"
|
||
#include "..\Minecraft.World\net.minecraft.network.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||
#include "..\Minecraft.World\Pos.h"
|
||
#include "..\Minecraft.World\System.h"
|
||
#include "..\Minecraft.World\StringHelpers.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.item.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.item.enchantment.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.damagesource.h"
|
||
#ifdef _WINDOWS64
|
||
#include "Windows64\Network\WinsockNetLayer.h"
|
||
#endif
|
||
#include <sstream>
|
||
#ifdef SPLIT_SAVES
|
||
#include "..\Minecraft.World\ConsoleSaveFileSplit.h"
|
||
#endif
|
||
#include "..\Minecraft.World\ConsoleSaveFileOriginal.h"
|
||
#include "..\Minecraft.World\Socket.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.entity.h"
|
||
#include "ProgressRenderer.h"
|
||
#include "ServerPlayer.h"
|
||
#include "GameRenderer.h"
|
||
#include "..\Minecraft.World\ThreadName.h"
|
||
#include "..\Minecraft.World\IntCache.h"
|
||
#include "..\Minecraft.World\CompressedTileStorage.h"
|
||
#include "..\Minecraft.World\SparseLightStorage.h"
|
||
#include "..\Minecraft.World\SparseDataStorage.h"
|
||
#include "..\Minecraft.World\compression.h"
|
||
#ifdef _XBOX
|
||
#include "Common\XUI\XUI_DebugSetCamera.h"
|
||
#endif
|
||
#include "PS3\PS3Extras\ShutdownManager.h"
|
||
#include "ServerCommandDispatcher.h"
|
||
#include "..\Minecraft.World\BiomeSource.h"
|
||
#include "PlayerChunkMap.h"
|
||
#include "Common\Telemetry\TelemetryManager.h"
|
||
#include "PlayerConnection.h"
|
||
#ifdef _XBOX_ONE
|
||
#include "Durango\Network\NetworkPlayerDurango.h"
|
||
#endif
|
||
|
||
#define DEBUG_SERVER_DONT_SPAWN_MOBS 0
|
||
|
||
//4J Added
|
||
MinecraftServer *MinecraftServer::server = NULL;
|
||
bool MinecraftServer::setTimeAtEndOfTick = false;
|
||
int64_t MinecraftServer::setTime = 0;
|
||
bool MinecraftServer::setTimeOfDayAtEndOfTick = false;
|
||
int64_t MinecraftServer::setTimeOfDay = 0;
|
||
bool MinecraftServer::m_bPrimaryPlayerSignedOut=false;
|
||
bool MinecraftServer::s_bServerHalted=false;
|
||
bool MinecraftServer::s_bSaveOnExitAnswered=false;
|
||
#ifdef _ACK_CHUNK_SEND_THROTTLING
|
||
bool MinecraftServer::s_hasSentEnoughPackets = false;
|
||
int64_t MinecraftServer::s_tickStartTime = 0;
|
||
vector<INetworkPlayer *> MinecraftServer::s_sentTo;
|
||
#else
|
||
int MinecraftServer::s_slowQueuePlayerIndex = 0;
|
||
int MinecraftServer::s_slowQueueLastTime = 0;
|
||
bool MinecraftServer::s_slowQueuePacketSent = false;
|
||
#endif
|
||
|
||
unordered_map<wstring, int> MinecraftServer::ironTimers;
|
||
|
||
static bool ShouldUseDedicatedServerProperties()
|
||
{
|
||
#ifdef _WINDOWS64
|
||
return g_Win64DedicatedServer;
|
||
#else
|
||
return false;
|
||
#endif
|
||
}
|
||
|
||
static int GetDedicatedServerInt(Settings *settings, const wchar_t *key, int defaultValue)
|
||
{
|
||
return (ShouldUseDedicatedServerProperties() && settings != NULL) ? settings->getInt(key, defaultValue) : defaultValue;
|
||
}
|
||
|
||
static bool GetDedicatedServerBool(Settings *settings, const wchar_t *key, bool defaultValue)
|
||
{
|
||
return (ShouldUseDedicatedServerProperties() && settings != NULL) ? settings->getBoolean(key, defaultValue) : defaultValue;
|
||
}
|
||
|
||
static wstring GetDedicatedServerString(Settings *settings, const wchar_t *key, const wstring &defaultValue)
|
||
{
|
||
return (ShouldUseDedicatedServerProperties() && settings != NULL) ? settings->getString(key, defaultValue) : defaultValue;
|
||
}
|
||
|
||
static void PrintConsoleLine(const wchar_t *prefix, const wstring &message)
|
||
{
|
||
wprintf(L"%ls%ls\n", prefix, message.c_str());
|
||
fflush(stdout);
|
||
}
|
||
|
||
static bool TryParseIntValue(const wstring &text, int &value)
|
||
{
|
||
std::wistringstream stream(text);
|
||
stream >> value;
|
||
return !stream.fail() && stream.eof();
|
||
}
|
||
|
||
static vector<wstring> SplitConsoleCommand(const wstring &command)
|
||
{
|
||
vector<wstring> tokens;
|
||
std::wistringstream stream(command);
|
||
wstring token;
|
||
while (stream >> token)
|
||
{
|
||
tokens.push_back(token);
|
||
}
|
||
return tokens;
|
||
}
|
||
|
||
static wstring JoinConsoleCommandTokens(const vector<wstring> &tokens, size_t startIndex)
|
||
{
|
||
wstring joined;
|
||
for (size_t i = startIndex; i < tokens.size(); ++i)
|
||
{
|
||
if (!joined.empty()) joined += L" ";
|
||
joined += tokens[i];
|
||
}
|
||
return joined;
|
||
}
|
||
|
||
static shared_ptr<ServerPlayer> FindPlayerByName(PlayerList *playerList, const wstring &name)
|
||
{
|
||
if (playerList == NULL) return nullptr;
|
||
|
||
for (size_t i = 0; i < playerList->players.size(); ++i)
|
||
{
|
||
shared_ptr<ServerPlayer> player = playerList->players[i];
|
||
if (player != NULL && equalsIgnoreCase(player->getName(), name))
|
||
{
|
||
return player;
|
||
}
|
||
}
|
||
|
||
return nullptr;
|
||
}
|
||
|
||
static void SetAllLevelTimes(MinecraftServer *server, int value)
|
||
{
|
||
for (unsigned int i = 0; i < server->levels.length; ++i)
|
||
{
|
||
if (server->levels[i] != NULL)
|
||
{
|
||
server->levels[i]->setDayTime(value);
|
||
}
|
||
}
|
||
}
|
||
|
||
static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCommand)
|
||
{
|
||
if (server == NULL)
|
||
return false;
|
||
|
||
wstring command = trimString(rawCommand);
|
||
if (command.empty())
|
||
return true;
|
||
|
||
if (command[0] == L'/')
|
||
{
|
||
command = trimString(command.substr(1));
|
||
}
|
||
|
||
vector<wstring> tokens = SplitConsoleCommand(command);
|
||
if (tokens.empty())
|
||
return true;
|
||
|
||
const wstring action = toLower(tokens[0]);
|
||
PlayerList *playerList = server->getPlayers();
|
||
|
||
if (action == L"help" || action == L"?")
|
||
{
|
||
server->info(L"Commands: help, stop, list, say <message>, save-all, time <set day|night|ticks|add ticks>, weather <clear|rain|thunder> [seconds], tp <player> <target>, give <player> <itemId> [amount] [aux], enchant <player> <enchantId> [level], kill <player>");
|
||
return true;
|
||
}
|
||
|
||
if (action == L"stop")
|
||
{
|
||
server->info(L"Stopping server...");
|
||
MinecraftServer::HaltServer();
|
||
return true;
|
||
}
|
||
|
||
if (action == L"list")
|
||
{
|
||
wstring playerNames = (playerList != NULL) ? playerList->getPlayerNames() : L"";
|
||
if (playerNames.empty()) playerNames = L"(none)";
|
||
server->info(L"Players (" + std::to_wstring((playerList != NULL) ? playerList->getPlayerCount() : 0) + L"): " + playerNames);
|
||
return true;
|
||
}
|
||
|
||
if (action == L"say")
|
||
{
|
||
if (tokens.size() < 2)
|
||
{
|
||
server->warn(L"Usage: say <message>");
|
||
return false;
|
||
}
|
||
|
||
wstring message = L"[Server] " + JoinConsoleCommandTokens(tokens, 1);
|
||
if (playerList != NULL)
|
||
{
|
||
playerList->broadcastAll(shared_ptr<ChatPacket>(new ChatPacket(message)));
|
||
}
|
||
server->info(message);
|
||
return true;
|
||
}
|
||
|
||
if (action == L"save-all")
|
||
{
|
||
if (playerList != NULL)
|
||
{
|
||
playerList->saveAll(NULL, false);
|
||
}
|
||
server->info(L"World saved.");
|
||
return true;
|
||
}
|
||
|
||
if (action == L"time")
|
||
{
|
||
if (tokens.size() < 2)
|
||
{
|
||
server->warn(L"Usage: time set <day|night|ticks> | time add <ticks>");
|
||
return false;
|
||
}
|
||
|
||
if (toLower(tokens[1]) == L"add")
|
||
{
|
||
if (tokens.size() < 3)
|
||
{
|
||
server->warn(L"Usage: time add <ticks>");
|
||
return false;
|
||
}
|
||
|
||
int delta = 0;
|
||
if (!TryParseIntValue(tokens[2], delta))
|
||
{
|
||
server->warn(L"Invalid tick value: " + tokens[2]);
|
||
return false;
|
||
}
|
||
|
||
for (unsigned int i = 0; i < server->levels.length; ++i)
|
||
{
|
||
if (server->levels[i] != NULL)
|
||
{
|
||
server->levels[i]->setDayTime(server->levels[i]->getDayTime() + delta);
|
||
}
|
||
}
|
||
|
||
server->info(L"Added " + std::to_wstring(delta) + L" ticks.");
|
||
return true;
|
||
}
|
||
|
||
wstring timeValue = toLower(tokens[1]);
|
||
if (timeValue == L"set")
|
||
{
|
||
if (tokens.size() < 3)
|
||
{
|
||
server->warn(L"Usage: time set <day|night|ticks>");
|
||
return false;
|
||
}
|
||
timeValue = toLower(tokens[2]);
|
||
}
|
||
|
||
int targetTime = 0;
|
||
if (timeValue == L"day")
|
||
{
|
||
targetTime = 0;
|
||
}
|
||
else if (timeValue == L"night")
|
||
{
|
||
targetTime = 12500;
|
||
}
|
||
else if (!TryParseIntValue(timeValue, targetTime))
|
||
{
|
||
server->warn(L"Invalid time value: " + timeValue);
|
||
return false;
|
||
}
|
||
|
||
SetAllLevelTimes(server, targetTime);
|
||
server->info(L"Time set to " + std::to_wstring(targetTime) + L".");
|
||
return true;
|
||
}
|
||
|
||
if (action == L"weather")
|
||
{
|
||
if (tokens.size() < 2)
|
||
{
|
||
server->warn(L"Usage: weather <clear|rain|thunder> [seconds]");
|
||
return false;
|
||
}
|
||
|
||
int durationSeconds = 600;
|
||
if (tokens.size() >= 3 && !TryParseIntValue(tokens[2], durationSeconds))
|
||
{
|
||
server->warn(L"Invalid duration: " + tokens[2]);
|
||
return false;
|
||
}
|
||
|
||
if (server->levels[0] == NULL)
|
||
{
|
||
server->warn(L"The overworld is not loaded.");
|
||
return false;
|
||
}
|
||
|
||
LevelData *levelData = server->levels[0]->getLevelData();
|
||
int duration = durationSeconds * SharedConstants::TICKS_PER_SECOND;
|
||
levelData->setRainTime(duration);
|
||
levelData->setThunderTime(duration);
|
||
|
||
wstring weather = toLower(tokens[1]);
|
||
if (weather == L"clear")
|
||
{
|
||
levelData->setRaining(false);
|
||
levelData->setThundering(false);
|
||
}
|
||
else if (weather == L"rain")
|
||
{
|
||
levelData->setRaining(true);
|
||
levelData->setThundering(false);
|
||
}
|
||
else if (weather == L"thunder")
|
||
{
|
||
levelData->setRaining(true);
|
||
levelData->setThundering(true);
|
||
}
|
||
else
|
||
{
|
||
server->warn(L"Usage: weather <clear|rain|thunder> [seconds]");
|
||
return false;
|
||
}
|
||
|
||
server->info(L"Weather set to " + weather + L".");
|
||
return true;
|
||
}
|
||
|
||
if (action == L"tp" || action == L"teleport")
|
||
{
|
||
if (tokens.size() < 3)
|
||
{
|
||
server->warn(L"Usage: tp <player> <target>");
|
||
return false;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> subject = FindPlayerByName(playerList, tokens[1]);
|
||
shared_ptr<ServerPlayer> destination = FindPlayerByName(playerList, tokens[2]);
|
||
if (subject == NULL)
|
||
{
|
||
server->warn(L"Unknown player: " + tokens[1]);
|
||
return false;
|
||
}
|
||
if (destination == NULL)
|
||
{
|
||
server->warn(L"Unknown player: " + tokens[2]);
|
||
return false;
|
||
}
|
||
if (subject->level->dimension->id != destination->level->dimension->id || !subject->isAlive())
|
||
{
|
||
server->warn(L"Teleport failed because the players are not in the same dimension or the source player is dead.");
|
||
return false;
|
||
}
|
||
|
||
subject->ride(nullptr);
|
||
subject->connection->teleport(destination->x, destination->y, destination->z, destination->yRot, destination->xRot);
|
||
server->info(L"Teleported " + subject->getName() + L" to " + destination->getName() + L".");
|
||
return true;
|
||
}
|
||
|
||
if (action == L"give")
|
||
{
|
||
if (tokens.size() < 3)
|
||
{
|
||
server->warn(L"Usage: give <player> <itemId> [amount] [aux]");
|
||
return false;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> player = FindPlayerByName(playerList, tokens[1]);
|
||
if (player == NULL)
|
||
{
|
||
server->warn(L"Unknown player: " + tokens[1]);
|
||
return false;
|
||
}
|
||
|
||
int itemId = 0;
|
||
int amount = 1;
|
||
int aux = 0;
|
||
if (!TryParseIntValue(tokens[2], itemId))
|
||
{
|
||
server->warn(L"Invalid item id: " + tokens[2]);
|
||
return false;
|
||
}
|
||
if (tokens.size() >= 4 && !TryParseIntValue(tokens[3], amount))
|
||
{
|
||
server->warn(L"Invalid amount: " + tokens[3]);
|
||
return false;
|
||
}
|
||
if (tokens.size() >= 5 && !TryParseIntValue(tokens[4], aux))
|
||
{
|
||
server->warn(L"Invalid aux value: " + tokens[4]);
|
||
return false;
|
||
}
|
||
if (itemId <= 0 || Item::items[itemId] == NULL)
|
||
{
|
||
server->warn(L"Unknown item id: " + std::to_wstring(itemId));
|
||
return false;
|
||
}
|
||
if (amount <= 0)
|
||
{
|
||
server->warn(L"Amount must be positive.");
|
||
return false;
|
||
}
|
||
|
||
shared_ptr<ItemInstance> itemInstance(new ItemInstance(itemId, amount, aux));
|
||
shared_ptr<ItemEntity> drop = player->drop(itemInstance);
|
||
if (drop != NULL)
|
||
{
|
||
drop->throwTime = 0;
|
||
}
|
||
server->info(L"Gave item " + std::to_wstring(itemId) + L" x" + std::to_wstring(amount) + L" to " + player->getName() + L".");
|
||
return true;
|
||
}
|
||
|
||
if (action == L"enchant")
|
||
{
|
||
if (tokens.size() < 3)
|
||
{
|
||
server->warn(L"Usage: enchant <player> <enchantId> [level]");
|
||
return false;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> player = FindPlayerByName(playerList, tokens[1]);
|
||
if (player == NULL)
|
||
{
|
||
server->warn(L"Unknown player: " + tokens[1]);
|
||
return false;
|
||
}
|
||
|
||
int enchantmentId = 0;
|
||
int enchantmentLevel = 1;
|
||
if (!TryParseIntValue(tokens[2], enchantmentId))
|
||
{
|
||
server->warn(L"Invalid enchantment id: " + tokens[2]);
|
||
return false;
|
||
}
|
||
if (tokens.size() >= 4 && !TryParseIntValue(tokens[3], enchantmentLevel))
|
||
{
|
||
server->warn(L"Invalid enchantment level: " + tokens[3]);
|
||
return false;
|
||
}
|
||
|
||
shared_ptr<ItemInstance> selectedItem = player->getSelectedItem();
|
||
if (selectedItem == NULL)
|
||
{
|
||
server->warn(L"The player is not holding an item.");
|
||
return false;
|
||
}
|
||
|
||
Enchantment *enchantment = Enchantment::enchantments[enchantmentId];
|
||
if (enchantment == NULL)
|
||
{
|
||
server->warn(L"Unknown enchantment id: " + std::to_wstring(enchantmentId));
|
||
return false;
|
||
}
|
||
if (!enchantment->canEnchant(selectedItem))
|
||
{
|
||
server->warn(L"That enchantment cannot be applied to the selected item.");
|
||
return false;
|
||
}
|
||
|
||
if (enchantmentLevel < enchantment->getMinLevel()) enchantmentLevel = enchantment->getMinLevel();
|
||
if (enchantmentLevel > enchantment->getMaxLevel()) enchantmentLevel = enchantment->getMaxLevel();
|
||
|
||
if (selectedItem->hasTag())
|
||
{
|
||
ListTag<CompoundTag> *enchantmentTags = selectedItem->getEnchantmentTags();
|
||
if (enchantmentTags != NULL)
|
||
{
|
||
for (int i = 0; i < enchantmentTags->size(); i++)
|
||
{
|
||
int type = enchantmentTags->get(i)->getShort((wchar_t *)ItemInstance::TAG_ENCH_ID);
|
||
if (Enchantment::enchantments[type] != NULL && !Enchantment::enchantments[type]->isCompatibleWith(enchantment))
|
||
{
|
||
server->warn(L"That enchantment conflicts with an existing enchantment on the selected item.");
|
||
return false;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
selectedItem->enchant(enchantment, enchantmentLevel);
|
||
server->info(L"Enchanted " + player->getName() + L"'s held item with " + std::to_wstring(enchantmentId) + L" " + std::to_wstring(enchantmentLevel) + L".");
|
||
return true;
|
||
}
|
||
|
||
if (action == L"kill")
|
||
{
|
||
if (tokens.size() < 2)
|
||
{
|
||
server->warn(L"Usage: kill <player>");
|
||
return false;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> player = FindPlayerByName(playerList, tokens[1]);
|
||
if (player == NULL)
|
||
{
|
||
server->warn(L"Unknown player: " + tokens[1]);
|
||
return false;
|
||
}
|
||
|
||
player->hurt(DamageSource::outOfWorld, 3.4e38f);
|
||
server->info(L"Killed " + player->getName() + L".");
|
||
return true;
|
||
}
|
||
|
||
server->warn(L"Unknown command: " + command);
|
||
return false;
|
||
}
|
||
|
||
MinecraftServer::MinecraftServer()
|
||
{
|
||
// 4J - added initialisers
|
||
connection = NULL;
|
||
settings = NULL;
|
||
players = NULL;
|
||
commands = NULL;
|
||
running = true;
|
||
m_bLoaded = false;
|
||
stopped = false;
|
||
tickCount = 0;
|
||
wstring progressStatus;
|
||
progress = 0;
|
||
motd = L"";
|
||
|
||
m_isServerPaused = false;
|
||
m_serverPausedEvent = new C4JThread::Event;
|
||
|
||
m_saveOnExit = false;
|
||
m_suspending = false;
|
||
|
||
m_ugcPlayersVersion = 0;
|
||
m_texturePackId = 0;
|
||
maxBuildHeight = Level::maxBuildHeight;
|
||
playerIdleTimeout = 0;
|
||
m_postUpdateThread = NULL;
|
||
forceGameType = false;
|
||
|
||
commandDispatcher = new ServerCommandDispatcher();
|
||
InitializeCriticalSection(&m_consoleInputCS);
|
||
|
||
DispenserBootstrap::bootStrap();
|
||
}
|
||
|
||
MinecraftServer::~MinecraftServer()
|
||
{
|
||
DeleteCriticalSection(&m_consoleInputCS);
|
||
}
|
||
|
||
bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DWORD initSettings, bool findSeed)
|
||
{
|
||
// 4J - removed
|
||
#if 0
|
||
commands = new ConsoleCommands(this);
|
||
|
||
Thread t = new Thread() {
|
||
public void run() {
|
||
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
|
||
String line = null;
|
||
try {
|
||
while (!stopped && running && (line = br.readLine()) != null) {
|
||
handleConsoleInput(line, MinecraftServer.this);
|
||
}
|
||
} catch (IOException e) {
|
||
e.printStackTrace();
|
||
}
|
||
}
|
||
};
|
||
t.setDaemon(true);
|
||
t.start();
|
||
|
||
|
||
LogConfigurator.initLogger();
|
||
logger.info("Starting minecraft server version " + VERSION);
|
||
|
||
if (Runtime.getRuntime().maxMemory() / 1024 / 1024 < 512) {
|
||
logger.warning("**** NOT ENOUGH RAM!");
|
||
logger.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
|
||
}
|
||
|
||
logger.info("Loading properties");
|
||
#endif
|
||
settings = new Settings(new File(L"server.properties"));
|
||
|
||
app.SetGameHostOption(eGameHostOption_Difficulty, GetDedicatedServerInt(settings, L"difficulty", app.GetGameHostOption(eGameHostOption_Difficulty)));
|
||
app.SetGameHostOption(eGameHostOption_GameType, GetDedicatedServerInt(settings, L"gamemode", app.GetGameHostOption(eGameHostOption_GameType)));
|
||
app.SetGameHostOption(eGameHostOption_Structures, GetDedicatedServerBool(settings, L"generate-structures", app.GetGameHostOption(eGameHostOption_Structures) > 0) ? 1 : 0);
|
||
app.SetGameHostOption(eGameHostOption_BonusChest, GetDedicatedServerBool(settings, L"bonus-chest", app.GetGameHostOption(eGameHostOption_BonusChest) > 0) ? 1 : 0);
|
||
app.SetGameHostOption(eGameHostOption_PvP, GetDedicatedServerBool(settings, L"pvp", app.GetGameHostOption(eGameHostOption_PvP) > 0) ? 1 : 0);
|
||
app.SetGameHostOption(eGameHostOption_TrustPlayers, GetDedicatedServerBool(settings, L"trust-players", app.GetGameHostOption(eGameHostOption_TrustPlayers) > 0) ? 1 : 0);
|
||
app.SetGameHostOption(eGameHostOption_FireSpreads, GetDedicatedServerBool(settings, L"fire-spreads", app.GetGameHostOption(eGameHostOption_FireSpreads) > 0) ? 1 : 0);
|
||
app.SetGameHostOption(eGameHostOption_TNT, GetDedicatedServerBool(settings, L"tnt", app.GetGameHostOption(eGameHostOption_TNT) > 0) ? 1 : 0);
|
||
|
||
app.DebugPrintf("\n*** SERVER SETTINGS ***\n");
|
||
app.DebugPrintf("ServerSettings: host-friends-only is %s\n",(app.GetGameHostOption(eGameHostOption_FriendsOfFriends)>0)?"on":"off");
|
||
app.DebugPrintf("ServerSettings: game-type is %s\n",(app.GetGameHostOption(eGameHostOption_GameType)==0)?"Survival Mode":"Creative Mode");
|
||
app.DebugPrintf("ServerSettings: pvp is %s\n",(app.GetGameHostOption(eGameHostOption_PvP)>0)?"on":"off");
|
||
app.DebugPrintf("ServerSettings: fire spreads is %s\n",(app.GetGameHostOption(eGameHostOption_FireSpreads)>0)?"on":"off");
|
||
app.DebugPrintf("ServerSettings: tnt explodes is %s\n",(app.GetGameHostOption(eGameHostOption_TNT)>0)?"on":"off");
|
||
app.DebugPrintf("\n");
|
||
|
||
// TODO 4J Stu - Init a load of settings based on data passed as params
|
||
//settings->setBooleanAndSave( L"host-friends-only", (app.GetGameHostOption(eGameHostOption_FriendsOfFriends)>0) );
|
||
|
||
// 4J - Unused
|
||
//localIp = settings->getString(L"server-ip", L"");
|
||
//onlineMode = settings->getBoolean(L"online-mode", true);
|
||
//motd = settings->getString(L"motd", L"A Minecraft Server");
|
||
//motd.replace('<27>', '$');
|
||
|
||
setAnimals(GetDedicatedServerBool(settings, L"spawn-animals", true));
|
||
setNpcsEnabled(GetDedicatedServerBool(settings, L"spawn-npcs", true));
|
||
setPvpAllowed(app.GetGameHostOption( eGameHostOption_PvP )>0?true:false);
|
||
|
||
// 4J Stu - We should never have hacked clients flying when they shouldn't be like the PC version, so enable flying always
|
||
// Fix for #46612 - TU5: Code: Multiplayer: A client can be banned for flying when accidentaly being blown by dynamite
|
||
setFlightAllowed(GetDedicatedServerBool(settings, L"allow-flight", true));
|
||
|
||
// 4J Stu - Enabling flight to stop it kicking us when we use it
|
||
#ifdef _DEBUG_MENUS_ENABLED
|
||
setFlightAllowed(true);
|
||
#endif
|
||
|
||
#if 1
|
||
connection = new ServerConnection(this);
|
||
Socket::Initialise(connection); // 4J - added
|
||
#else
|
||
// 4J - removed
|
||
InetAddress localAddress = null;
|
||
if (localIp.length() > 0) localAddress = InetAddress.getByName(localIp);
|
||
port = settings.getInt("server-port", DEFAULT_MINECRAFT_PORT);
|
||
|
||
logger.info("Starting Minecraft server on " + (localIp.length() == 0 ? "*" : localIp) + ":" + port);
|
||
try {
|
||
connection = new ServerConnection(this, localAddress, port);
|
||
} catch (IOException e) {
|
||
logger.warning("**** FAILED TO BIND TO PORT!");
|
||
logger.log(Level.WARNING, "The exception was: " + e.toString());
|
||
logger.warning("Perhaps a server is already running on that port?");
|
||
return false;
|
||
}
|
||
|
||
if (!onlineMode) {
|
||
logger.warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
|
||
logger.warning("The server will make no attempt to authenticate usernames. Beware.");
|
||
logger.warning("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
|
||
logger.warning("To change this, set \"online-mode\" to \"true\" in the server.settings file.");
|
||
}
|
||
#endif
|
||
setPlayers(new PlayerList(this));
|
||
#ifdef _WINDOWS64
|
||
{
|
||
int maxP = getPlayerList()->getMaxPlayers();
|
||
WinsockNetLayer::UpdateAdvertiseMaxPlayers((BYTE)(maxP > 255 ? 255 : maxP));
|
||
}
|
||
#endif
|
||
|
||
// 4J-JEV: Need to wait for levelGenerationOptions to load.
|
||
while ( app.getLevelGenerationOptions() != NULL && !app.getLevelGenerationOptions()->hasLoadedData() )
|
||
Sleep(1);
|
||
|
||
if ( app.getLevelGenerationOptions() != NULL && !app.getLevelGenerationOptions()->ready() )
|
||
{
|
||
// TODO: Stop loading, add error message.
|
||
}
|
||
|
||
int64_t levelNanoTime = System::nanoTime();
|
||
|
||
wstring levelName = (initData && !initData->levelName.empty()) ? initData->levelName : GetDedicatedServerString(settings, L"level-name", L"world");
|
||
wstring levelTypeString;
|
||
|
||
bool gameRuleUseFlatWorld = false;
|
||
if(app.getLevelGenerationOptions() != NULL)
|
||
{
|
||
gameRuleUseFlatWorld = app.getLevelGenerationOptions()->getuseFlatWorld();
|
||
}
|
||
if(gameRuleUseFlatWorld || app.GetGameHostOption(eGameHostOption_LevelType)>0)
|
||
{
|
||
levelTypeString = GetDedicatedServerString(settings, L"level-type", L"flat");
|
||
}
|
||
else
|
||
{
|
||
levelTypeString = GetDedicatedServerString(settings, L"level-type",L"default");
|
||
}
|
||
|
||
LevelType *pLevelType = LevelType::getLevelType(levelTypeString);
|
||
if (pLevelType == NULL)
|
||
{
|
||
pLevelType = LevelType::lvl_normal;
|
||
}
|
||
|
||
ProgressRenderer *mcprogress = Minecraft::GetInstance()->progressRenderer;
|
||
mcprogress->progressStart(IDS_PROGRESS_INITIALISING_SERVER);
|
||
|
||
if( findSeed )
|
||
{
|
||
#ifdef __PSVITA__
|
||
seed = BiomeSource::findSeed(pLevelType, &running);
|
||
#else
|
||
seed = BiomeSource::findSeed(pLevelType);
|
||
#endif
|
||
}
|
||
|
||
setMaxBuildHeight(GetDedicatedServerInt(settings, L"max-build-height", Level::maxBuildHeight));
|
||
setMaxBuildHeight(((getMaxBuildHeight() + 8) / 16) * 16);
|
||
setMaxBuildHeight(Mth::clamp(getMaxBuildHeight(), 64, Level::maxBuildHeight));
|
||
//settings->setProperty(L"max-build-height", maxBuildHeight);
|
||
|
||
#if 0
|
||
wstring levelSeedString = settings->getString(L"level-seed", L"");
|
||
int64_t levelSeed = (new Random())->nextLong();
|
||
if (levelSeedString.length() > 0)
|
||
{
|
||
long newSeed = _fromString<int64_t>(levelSeedString);
|
||
if (newSeed != 0) {
|
||
levelSeed = newSeed;
|
||
}
|
||
}
|
||
#endif
|
||
// logger.info("Preparing level \"" + levelName + "\"");
|
||
m_bLoaded = loadLevel(new McRegionLevelStorageSource(File(L".")), levelName, seed, pLevelType, initData);
|
||
// logger.info("Done (" + (System.nanoTime() - levelNanoTime) + "ns)! For help, type \"help\" or \"?\"");
|
||
|
||
// 4J delete passed in save data now - this is only required for the tutorial which is loaded by passing data directly in rather than using the storage manager
|
||
if( initData->saveData )
|
||
{
|
||
delete initData->saveData->data;
|
||
initData->saveData->data = 0;
|
||
initData->saveData->fileSize = 0;
|
||
}
|
||
|
||
g_NetworkManager.ServerReady(); // 4J added
|
||
return m_bLoaded;
|
||
|
||
}
|
||
|
||
// 4J - added - extra thread to post processing on separate thread during level creation
|
||
int MinecraftServer::runPostUpdate(void* lpParam)
|
||
{
|
||
ShutdownManager::HasStarted(ShutdownManager::ePostProcessThread);
|
||
|
||
MinecraftServer *server = (MinecraftServer *)lpParam;
|
||
Entity::useSmallIds(); // This thread can end up spawning entities as resources
|
||
IntCache::CreateNewThreadStorage();
|
||
AABB::CreateNewThreadStorage();
|
||
Vec3::CreateNewThreadStorage();
|
||
Compression::UseDefaultThreadStorage();
|
||
Level::enableLightingCache();
|
||
Tile::CreateNewThreadStorage();
|
||
|
||
// Update lights for both levels until we are signalled to terminate
|
||
do
|
||
{
|
||
EnterCriticalSection(&server->m_postProcessCS);
|
||
if( server->m_postProcessRequests.size() )
|
||
{
|
||
MinecraftServer::postProcessRequest request = server->m_postProcessRequests.back();
|
||
server->m_postProcessRequests.pop_back();
|
||
LeaveCriticalSection(&server->m_postProcessCS);
|
||
static int count = 0;
|
||
PIXBeginNamedEvent(0,"Post processing %d ", (count++)%8);
|
||
request.chunkSource->postProcess(request.chunkSource, request.x, request.z );
|
||
PIXEndNamedEvent();
|
||
}
|
||
else
|
||
{
|
||
LeaveCriticalSection(&server->m_postProcessCS);
|
||
}
|
||
Sleep(1);
|
||
} while (!server->m_postUpdateTerminate && ShutdownManager::ShouldRun(ShutdownManager::ePostProcessThread));
|
||
//#ifndef __PS3__
|
||
// One final pass through updates to make sure we're done
|
||
EnterCriticalSection(&server->m_postProcessCS);
|
||
int maxRequests = server->m_postProcessRequests.size();
|
||
while(server->m_postProcessRequests.size() && ShutdownManager::ShouldRun(ShutdownManager::ePostProcessThread) )
|
||
{
|
||
MinecraftServer::postProcessRequest request = server->m_postProcessRequests.back();
|
||
server->m_postProcessRequests.pop_back();
|
||
LeaveCriticalSection(&server->m_postProcessCS);
|
||
request.chunkSource->postProcess(request.chunkSource, request.x, request.z );
|
||
#ifdef __PS3__
|
||
#ifndef _CONTENT_PACKAGE
|
||
if((server->m_postProcessRequests.size() % 10) == 0)
|
||
printf("processing request %00d\n", server->m_postProcessRequests.size());
|
||
#endif
|
||
Sleep(1);
|
||
#endif
|
||
EnterCriticalSection(&server->m_postProcessCS);
|
||
}
|
||
LeaveCriticalSection(&server->m_postProcessCS);
|
||
//#endif //__PS3__
|
||
Tile::ReleaseThreadStorage();
|
||
IntCache::ReleaseThreadStorage();
|
||
AABB::ReleaseThreadStorage();
|
||
Vec3::ReleaseThreadStorage();
|
||
Level::destroyLightingCache();
|
||
|
||
ShutdownManager::HasFinished(ShutdownManager::ePostProcessThread);
|
||
|
||
return 0;
|
||
}
|
||
|
||
void MinecraftServer::addPostProcessRequest(ChunkSource *chunkSource, int x, int z)
|
||
{
|
||
EnterCriticalSection(&m_postProcessCS);
|
||
m_postProcessRequests.push_back(MinecraftServer::postProcessRequest(x,z,chunkSource));
|
||
LeaveCriticalSection(&m_postProcessCS);
|
||
}
|
||
|
||
void MinecraftServer::postProcessTerminate(ProgressRenderer *mcprogress)
|
||
{
|
||
DWORD status = 0;
|
||
|
||
EnterCriticalSection(&server->m_postProcessCS);
|
||
size_t postProcessItemCount = server->m_postProcessRequests.size();
|
||
LeaveCriticalSection(&server->m_postProcessCS);
|
||
|
||
do
|
||
{
|
||
status = m_postUpdateThread->WaitForCompletion(50);
|
||
if( status == WAIT_TIMEOUT )
|
||
{
|
||
EnterCriticalSection(&server->m_postProcessCS);
|
||
size_t postProcessItemRemaining = server->m_postProcessRequests.size();
|
||
LeaveCriticalSection(&server->m_postProcessCS);
|
||
|
||
if( postProcessItemCount )
|
||
{
|
||
mcprogress->progressStagePercentage((postProcessItemCount - postProcessItemRemaining) * 100 / postProcessItemCount);
|
||
}
|
||
CompressedTileStorage::tick();
|
||
SparseLightStorage::tick();
|
||
SparseDataStorage::tick();
|
||
}
|
||
} while ( status == WAIT_TIMEOUT );
|
||
delete m_postUpdateThread;
|
||
m_postUpdateThread = NULL;
|
||
DeleteCriticalSection(&m_postProcessCS);
|
||
}
|
||
|
||
bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring& name, int64_t levelSeed, LevelType *pLevelType, NetworkGameInitData *initData)
|
||
{
|
||
// 4J - TODO - do with new save stuff
|
||
// if (storageSource->requiresConversion(name))
|
||
// {
|
||
// assert(false);
|
||
// }
|
||
ProgressRenderer *mcprogress = Minecraft::GetInstance()->progressRenderer;
|
||
|
||
// 4J TODO - free levels here if there are already some?
|
||
levels = ServerLevelArray(3);
|
||
|
||
int gameTypeId = GetDedicatedServerInt(settings, L"gamemode", app.GetGameHostOption(eGameHostOption_GameType));//LevelSettings::GAMETYPE_SURVIVAL);
|
||
GameType *gameType = LevelSettings::validateGameType(gameTypeId);
|
||
app.DebugPrintf("Default game type: %d\n" , gameTypeId);
|
||
|
||
LevelSettings *levelSettings = new LevelSettings(levelSeed, gameType, app.GetGameHostOption(eGameHostOption_Structures)>0?true:false, isHardcore(), true, pLevelType, initData->xzSize, initData->hellScale);
|
||
if( app.GetGameHostOption(eGameHostOption_BonusChest ) ) levelSettings->enableStartingBonusItems();
|
||
|
||
// 4J - temp - load existing level
|
||
shared_ptr<McRegionLevelStorage> storage = nullptr;
|
||
bool levelChunksNeedConverted = false;
|
||
if( initData->saveData != NULL )
|
||
{
|
||
// We are loading a file from disk with the data passed in
|
||
|
||
#ifdef SPLIT_SAVES
|
||
ConsoleSaveFileOriginal oldFormatSave( initData->saveData->saveName, initData->saveData->data, initData->saveData->fileSize, false, initData->savePlatform );
|
||
ConsoleSaveFile* pSave = new ConsoleSaveFileSplit( &oldFormatSave );
|
||
|
||
//ConsoleSaveFile* pSave = new ConsoleSaveFileSplit( initData->saveData->saveName, initData->saveData->data, initData->saveData->fileSize, false, initData->savePlatform );
|
||
#else
|
||
ConsoleSaveFile* pSave = new ConsoleSaveFileOriginal( initData->saveData->saveName, initData->saveData->data, initData->saveData->fileSize, false, initData->savePlatform );
|
||
#endif
|
||
if(pSave->isSaveEndianDifferent())
|
||
levelChunksNeedConverted = true;
|
||
pSave->ConvertToLocalPlatform(); // check if we need to convert this file from PS3->PS4
|
||
|
||
storage = shared_ptr<McRegionLevelStorage>(new McRegionLevelStorage(pSave, File(L"."), name, true));
|
||
}
|
||
else
|
||
{
|
||
// We are loading a save from the storage manager
|
||
#ifdef SPLIT_SAVES
|
||
bool bLevelGenBaseSave = false;
|
||
LevelGenerationOptions *levelGen = app.getLevelGenerationOptions();
|
||
if( levelGen != NULL && levelGen->requiresBaseSave())
|
||
{
|
||
DWORD fileSize = 0;
|
||
LPVOID pvSaveData = levelGen->getBaseSaveData(fileSize);
|
||
if(pvSaveData && fileSize != 0) bLevelGenBaseSave = true;
|
||
}
|
||
ConsoleSaveFileSplit *newFormatSave = NULL;
|
||
if(bLevelGenBaseSave)
|
||
{
|
||
ConsoleSaveFileOriginal oldFormatSave( L"" );
|
||
newFormatSave = new ConsoleSaveFileSplit( &oldFormatSave );
|
||
}
|
||
else
|
||
{
|
||
newFormatSave = new ConsoleSaveFileSplit( L"" );
|
||
}
|
||
|
||
storage = shared_ptr<McRegionLevelStorage>(new McRegionLevelStorage(newFormatSave, File(L"."), name, true));
|
||
#else
|
||
storage = shared_ptr<McRegionLevelStorage>(new McRegionLevelStorage(new ConsoleSaveFileOriginal( L"" ), File(L"."), name, true));
|
||
#endif
|
||
}
|
||
|
||
// McRegionLevelStorage *storage = new McRegionLevelStorage(new ConsoleSaveFile( L"" ), L"", L"", 0); // original
|
||
// McRegionLevelStorage *storage = new McRegionLevelStorage(File(L"."), name, true); // TODO
|
||
for (unsigned int i = 0; i < levels.length; i++)
|
||
{
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() )
|
||
{
|
||
return false;
|
||
}
|
||
|
||
// String levelName = name;
|
||
// if (i == 1) levelName += "_nether";
|
||
int dimension = 0;
|
||
if (i == 1) dimension = -1;
|
||
if (i == 2) dimension = 1;
|
||
if (i == 0)
|
||
{
|
||
levels[i] = new ServerLevel(this, storage, name, dimension, levelSettings);
|
||
if(app.getLevelGenerationOptions() != NULL)
|
||
{
|
||
LevelGenerationOptions *mapOptions = app.getLevelGenerationOptions();
|
||
Pos *spawnPos = mapOptions->getSpawnPos();
|
||
if( spawnPos != NULL )
|
||
{
|
||
levels[i]->setSpawnPos( spawnPos );
|
||
}
|
||
|
||
levels[i]->getLevelData()->setHasBeenInCreative(mapOptions->isFromDLC());
|
||
}
|
||
}
|
||
else levels[i] = new DerivedServerLevel(this, storage, name, dimension, levelSettings, levels[0]);
|
||
// levels[i]->addListener(new ServerLevelListener(this, levels[i])); // 4J - have moved this to the ServerLevel ctor so that it is set up in time for the first chunk to load, which might actually happen there
|
||
|
||
// 4J Stu - We set the levels difficulty based on the minecraft options
|
||
//levels[i]->difficulty = settings->getBoolean(L"spawn-monsters", true) ? Difficulty::EASY : Difficulty::PEACEFUL;
|
||
Minecraft *pMinecraft = Minecraft::GetInstance();
|
||
// m_lastSentDifficulty = pMinecraft->options->difficulty;
|
||
levels[i]->difficulty = app.GetGameHostOption(eGameHostOption_Difficulty); //pMinecraft->options->difficulty;
|
||
app.DebugPrintf("MinecraftServer::loadLevel - Difficulty = %d\n",levels[i]->difficulty);
|
||
|
||
#if DEBUG_SERVER_DONT_SPAWN_MOBS
|
||
levels[i]->setSpawnSettings(false, false);
|
||
#else
|
||
levels[i]->setSpawnSettings(GetDedicatedServerBool(settings, L"spawn-monsters", true), animals);
|
||
#endif
|
||
levels[i]->getLevelData()->setGameType(gameType);
|
||
|
||
if(app.getLevelGenerationOptions() != NULL)
|
||
{
|
||
LevelGenerationOptions *mapOptions = app.getLevelGenerationOptions();
|
||
levels[i]->getLevelData()->setHasBeenInCreative(mapOptions->getLevelHasBeenInCreative() );
|
||
}
|
||
|
||
players->setLevel(levels);
|
||
}
|
||
|
||
if( levels[0]->isNew )
|
||
{
|
||
mcprogress->progressStage(IDS_PROGRESS_GENERATING_SPAWN_AREA);
|
||
}
|
||
else
|
||
{
|
||
mcprogress->progressStage(IDS_PROGRESS_LOADING_SPAWN_AREA);
|
||
}
|
||
app.SetGameHostOption( eGameHostOption_HasBeenInCreative, gameType == GameType::CREATIVE || levels[0]->getHasBeenInCreative() );
|
||
app.SetGameHostOption( eGameHostOption_Structures, levels[0]->isGenerateMapFeatures() );
|
||
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false;
|
||
|
||
// 4J - Make a new thread to do post processing
|
||
InitializeCriticalSection(&m_postProcessCS);
|
||
|
||
// 4J-PB - fix for 108310 - TCR #001 BAS Game Stability: TU12: Code: Compliance: Crash after creating world on "journey" seed.
|
||
// Stack gets very deep with some sand tower falling, so increased the stacj to 256K from 128k on other platforms (was already set to that on PS3 and Orbis)
|
||
|
||
m_postUpdateThread = new C4JThread(runPostUpdate, this, "Post processing", 256*1024);
|
||
|
||
m_postUpdateTerminate = false;
|
||
m_postUpdateThread->SetProcessor(CPU_CORE_POST_PROCESSING);
|
||
m_postUpdateThread->SetPriority(THREAD_PRIORITY_ABOVE_NORMAL);
|
||
m_postUpdateThread->Run();
|
||
|
||
int64_t startTime = System::currentTimeMillis();
|
||
|
||
// 4J Stu - Added this to temporarily make starting games on vita faster
|
||
#ifdef __PSVITA__
|
||
int r = 48;
|
||
#else
|
||
int r = 196;
|
||
#endif
|
||
|
||
// 4J JEV: load gameRules.
|
||
ConsoleSavePath filepath(GAME_RULE_SAVENAME);
|
||
ConsoleSaveFile *csf = getLevel(0)->getLevelStorage()->getSaveFile();
|
||
if( csf->doesFileExist(filepath) )
|
||
{
|
||
DWORD numberOfBytesRead;
|
||
byteArray ba_gameRules;
|
||
|
||
FileEntry *fe = csf->createFile(filepath);
|
||
|
||
ba_gameRules.length = fe->getFileSize();
|
||
ba_gameRules.data = new BYTE[ ba_gameRules.length ];
|
||
|
||
csf->setFilePointer(fe,0,NULL,FILE_BEGIN);
|
||
csf->readFile(fe, ba_gameRules.data, ba_gameRules.length, &numberOfBytesRead);
|
||
assert(numberOfBytesRead == ba_gameRules.length);
|
||
|
||
app.m_gameRules.loadGameRules(ba_gameRules.data, ba_gameRules.length);
|
||
csf->closeHandle(fe);
|
||
}
|
||
|
||
int64_t lastTime = System::currentTimeMillis();
|
||
#ifdef _LARGE_WORLDS
|
||
if(app.GetGameNewWorldSize() > levels[0]->getLevelData()->getXZSizeOld())
|
||
{
|
||
if(!app.GetGameNewWorldSizeUseMoat()) // check the moat settings to see if we should be overwriting the edge tiles
|
||
{
|
||
overwriteBordersForNewWorldSize(levels[0]);
|
||
}
|
||
// we're always overwriting hell edges
|
||
int oldHellSize = levels[0]->getLevelData()->getXZHellSizeOld();
|
||
overwriteHellBordersForNewWorldSize(levels[1], oldHellSize);
|
||
}
|
||
#endif
|
||
|
||
// 4J Stu - This loop is changed in 1.0.1 to only process the first level (ie the overworld), but I think we still want to do them all
|
||
int i = 0;
|
||
for (int i = 0; i < levels.length ; i++)
|
||
{
|
||
// logger.info("Preparing start region for level " + i);
|
||
if (i == 0 || GetDedicatedServerBool(settings, L"allow-nether", true))
|
||
{
|
||
ServerLevel *level = levels[i];
|
||
if(levelChunksNeedConverted)
|
||
{
|
||
// storage->getSaveFile()->convertLevelChunks(level)
|
||
}
|
||
|
||
#if 0
|
||
int64_t lastStorageTickTime = System::currentTimeMillis();
|
||
|
||
// Test code to enable full creation of levels at start up
|
||
int halfsidelen = ( i == 0 ) ? 27 : 9;
|
||
for( int x = -halfsidelen; x < halfsidelen; x++ )
|
||
{
|
||
for( int z = -halfsidelen; z < halfsidelen; z++ )
|
||
{
|
||
int total = halfsidelen * halfsidelen * 4;
|
||
int pos = z + halfsidelen + ( ( x + halfsidelen ) * 2 * halfsidelen );
|
||
mcprogress->progressStagePercentage((pos) * 100 / total);
|
||
level->cache->create(x,z, true); // 4J - added parameter to disable postprocessing here
|
||
|
||
if( System::currentTimeMillis() - lastStorageTickTime > 50 )
|
||
{
|
||
CompressedTileStorage::tick();
|
||
SparseLightStorage::tick();
|
||
SparseDataStorage::tick();
|
||
lastStorageTickTime = System::currentTimeMillis();
|
||
}
|
||
}
|
||
}
|
||
#else
|
||
int64_t lastStorageTickTime = System::currentTimeMillis();
|
||
Pos *spawnPos = level->getSharedSpawnPos();
|
||
|
||
int twoRPlusOne = r*2 + 1;
|
||
int total = twoRPlusOne * twoRPlusOne;
|
||
for (int x = -r; x <= r && running; x += 16)
|
||
{
|
||
for (int z = -r; z <= r && running; z += 16)
|
||
{
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() )
|
||
{
|
||
delete spawnPos;
|
||
m_postUpdateTerminate = true;
|
||
postProcessTerminate(mcprogress);
|
||
return false;
|
||
}
|
||
// printf(">>>%d %d %d\n",i,x,z);
|
||
// int64_t now = System::currentTimeMillis();
|
||
// if (now < lastTime) lastTime = now;
|
||
// if (now > lastTime + 1000)
|
||
{
|
||
int pos = (x + r) * twoRPlusOne + (z + 1);
|
||
// setProgress(L"Preparing spawn area", (pos) * 100 / total);
|
||
mcprogress->progressStagePercentage((pos+r) * 100 / total);
|
||
// lastTime = now;
|
||
}
|
||
static int count = 0;
|
||
PIXBeginNamedEvent(0,"Creating %d ", (count++)%8);
|
||
level->cache->create((spawnPos->x + x) >> 4, (spawnPos->z + z) >> 4, true); // 4J - added parameter to disable postprocessing here
|
||
PIXEndNamedEvent();
|
||
// while (level->updateLights() && running)
|
||
// ;
|
||
if( System::currentTimeMillis() - lastStorageTickTime > 50 )
|
||
{
|
||
CompressedTileStorage::tick();
|
||
SparseLightStorage::tick();
|
||
SparseDataStorage::tick();
|
||
lastStorageTickTime = System::currentTimeMillis();
|
||
}
|
||
}
|
||
}
|
||
|
||
// 4J - removed this as now doing the recheckGaps call when each chunk is post-processed, so can happen on things outside of the spawn area too
|
||
#if 0
|
||
// 4J - added this code to propagate lighting properly in the spawn area before we go sharing it with the local client or across the network
|
||
for (int x = -r; x <= r && running; x += 16)
|
||
{
|
||
for (int z = -r; z <= r && running; z += 16)
|
||
{
|
||
PIXBeginNamedEvent(0,"Lighting gaps for %d %d",x,z);
|
||
level->getChunkAt(spawnPos->x + x, spawnPos->z + z)->recheckGaps(true);
|
||
PIXEndNamedEvent();
|
||
}
|
||
}
|
||
#endif
|
||
|
||
delete spawnPos;
|
||
#endif
|
||
}
|
||
}
|
||
// printf("Main thread complete at %dms\n",System::currentTimeMillis() - startTime);
|
||
|
||
// Wait for post processing, then lighting threads, to end (post-processing may make more lighting changes)
|
||
m_postUpdateTerminate = true;
|
||
|
||
postProcessTerminate(mcprogress);
|
||
|
||
|
||
// stronghold position?
|
||
if(levels[0]->dimension->id==0)
|
||
{
|
||
|
||
app.DebugPrintf("===================================\n");
|
||
|
||
if(!levels[0]->getLevelData()->getHasStronghold())
|
||
{
|
||
int x,z;
|
||
if(app.GetTerrainFeaturePosition(eTerrainFeature_Stronghold,&x,&z))
|
||
{
|
||
levels[0]->getLevelData()->setXStronghold(x);
|
||
levels[0]->getLevelData()->setZStronghold(z);
|
||
levels[0]->getLevelData()->setHasStronghold();
|
||
|
||
app.DebugPrintf("=== FOUND stronghold in terrain features list\n");
|
||
|
||
}
|
||
else
|
||
{
|
||
// can't find the stronghold position in the terrain feature list. Do we have to run a post-process?
|
||
app.DebugPrintf("=== Can't find stronghold in terrain features list\n");
|
||
}
|
||
}
|
||
else
|
||
{
|
||
app.DebugPrintf("=== Leveldata has stronghold position\n");
|
||
}
|
||
app.DebugPrintf("===================================\n");
|
||
}
|
||
|
||
// printf("Post processing complete at %dms\n",System::currentTimeMillis() - startTime);
|
||
|
||
// printf("Lighting complete at %dms\n",System::currentTimeMillis() - startTime);
|
||
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false;
|
||
|
||
if( levels[1]->isNew )
|
||
{
|
||
levels[1]->save(true, mcprogress);
|
||
}
|
||
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false;
|
||
|
||
if( levels[2]->isNew )
|
||
{
|
||
levels[2]->save(true, mcprogress);
|
||
}
|
||
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false;
|
||
|
||
// 4J - added - immediately save newly created level, like single player game
|
||
// 4J Stu - We also want to immediately save the tutorial
|
||
if ( levels[0]->isNew )
|
||
saveGameRules();
|
||
|
||
if( levels[0]->isNew )
|
||
{
|
||
levels[0]->save(true, mcprogress);
|
||
}
|
||
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false;
|
||
|
||
if( levels[0]->isNew || levels[1]->isNew || levels[2]->isNew )
|
||
{
|
||
#ifndef _WINDOWS64
|
||
// On Windows64 we skip the automatic initial save so that choosing
|
||
// "Exit without saving" on a new world does not leave an orphaned save folder.
|
||
levels[0]->saveToDisc(mcprogress, false);
|
||
#endif
|
||
}
|
||
|
||
if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false;
|
||
|
||
/*
|
||
* int r = 24; for (int x = -r; x <= r; x++) {
|
||
* setProgress("Preparing spawn area", (x + r) * 100 / (r + r + 1)); for (int z
|
||
* = -r; z <= r; z++) { if (!running) return; level.cache.create((level.xSpawn
|
||
* >> 4) + x, (level.zSpawn >> 4) + z); while (running && level.updateLights())
|
||
* ; } }
|
||
*/
|
||
endProgress();
|
||
|
||
return true;
|
||
}
|
||
|
||
#ifdef _LARGE_WORLDS
|
||
void MinecraftServer::overwriteBordersForNewWorldSize(ServerLevel* level)
|
||
{
|
||
// recreate the chunks round the border (2 chunks or 32 blocks deep), deleting any player data from them
|
||
app.DebugPrintf("Expanding level size\n");
|
||
int oldSize = level->getLevelData()->getXZSizeOld();
|
||
// top
|
||
int minVal = -oldSize/2;
|
||
int maxVal = (oldSize/2)-1;
|
||
for(int xVal = minVal; xVal <= maxVal; xVal++)
|
||
{
|
||
int zVal = minVal;
|
||
level->cache->overwriteLevelChunkFromSource(xVal, zVal);
|
||
level->cache->overwriteLevelChunkFromSource(xVal, zVal+1);
|
||
}
|
||
// bottom
|
||
for(int xVal = minVal; xVal <= maxVal; xVal++)
|
||
{
|
||
int zVal = maxVal;
|
||
level->cache->overwriteLevelChunkFromSource(xVal, zVal);
|
||
level->cache->overwriteLevelChunkFromSource(xVal, zVal-1);
|
||
}
|
||
// left
|
||
for(int zVal = minVal; zVal <= maxVal; zVal++)
|
||
{
|
||
int xVal = minVal;
|
||
level->cache->overwriteLevelChunkFromSource(xVal, zVal);
|
||
level->cache->overwriteLevelChunkFromSource(xVal+1, zVal);
|
||
}
|
||
// right
|
||
for(int zVal = minVal; zVal <= maxVal; zVal++)
|
||
{
|
||
int xVal = maxVal;
|
||
level->cache->overwriteLevelChunkFromSource(xVal, zVal);
|
||
level->cache->overwriteLevelChunkFromSource(xVal-1, zVal);
|
||
}
|
||
}
|
||
|
||
void MinecraftServer::overwriteHellBordersForNewWorldSize(ServerLevel* level, int oldHellSize)
|
||
{
|
||
// recreate the chunks round the border (1 chunk or 16 blocks deep), deleting any player data from them
|
||
app.DebugPrintf("Expanding level size\n");
|
||
// top
|
||
int minVal = -oldHellSize/2;
|
||
int maxVal = (oldHellSize/2)-1;
|
||
for(int xVal = minVal; xVal <= maxVal; xVal++)
|
||
{
|
||
int zVal = minVal;
|
||
level->cache->overwriteHellLevelChunkFromSource(xVal, zVal, minVal, maxVal);
|
||
}
|
||
// bottom
|
||
for(int xVal = minVal; xVal <= maxVal; xVal++)
|
||
{
|
||
int zVal = maxVal;
|
||
level->cache->overwriteHellLevelChunkFromSource(xVal, zVal, minVal, maxVal);
|
||
}
|
||
// left
|
||
for(int zVal = minVal; zVal <= maxVal; zVal++)
|
||
{
|
||
int xVal = minVal;
|
||
level->cache->overwriteHellLevelChunkFromSource(xVal, zVal, minVal, maxVal);
|
||
}
|
||
// right
|
||
for(int zVal = minVal; zVal <= maxVal; zVal++)
|
||
{
|
||
int xVal = maxVal;
|
||
level->cache->overwriteHellLevelChunkFromSource(xVal, zVal, minVal, maxVal);
|
||
}
|
||
}
|
||
|
||
#endif
|
||
|
||
void MinecraftServer::setProgress(const wstring& status, int progress)
|
||
{
|
||
progressStatus = status;
|
||
this->progress = progress;
|
||
// logger.info(status + ": " + progress + "%");
|
||
}
|
||
|
||
void MinecraftServer::endProgress()
|
||
{
|
||
progressStatus = L"";
|
||
this->progress = 0;
|
||
}
|
||
|
||
void MinecraftServer::saveAllChunks()
|
||
{
|
||
// logger.info("Saving chunks");
|
||
for (unsigned int i = 0; i < levels.length; i++)
|
||
{
|
||
// 4J Stu - Due to the way save mounting is handled on XboxOne, we can actually save after the player has signed out.
|
||
#ifndef _XBOX_ONE
|
||
if( m_bPrimaryPlayerSignedOut ) break;
|
||
#endif
|
||
// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
|
||
// with the data from the nethers leveldata.
|
||
// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
|
||
ServerLevel *level = levels[levels.length - 1 - i];
|
||
if( level ) // 4J - added check as level can be NULL if we end up in stopServer really early on due to network failure
|
||
{
|
||
level->save(true, Minecraft::GetInstance()->progressRenderer);
|
||
|
||
// Only close the level storage when we have saved the last level, otherwise we need to recreate the region files
|
||
// when saving the next levels
|
||
if( i == (levels.length - 1))
|
||
{
|
||
level->closeLevelStorage();
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
// 4J-JEV: Added
|
||
void MinecraftServer::saveGameRules()
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_DistributableSave))
|
||
{
|
||
// Do nothing
|
||
}
|
||
else
|
||
#endif
|
||
{
|
||
byteArray ba;
|
||
ba.data = NULL;
|
||
app.m_gameRules.saveGameRules( &ba.data, &ba.length );
|
||
|
||
if (ba.data != NULL)
|
||
{
|
||
ConsoleSaveFile *csf = getLevel(0)->getLevelStorage()->getSaveFile();
|
||
FileEntry *fe = csf->createFile(ConsoleSavePath(GAME_RULE_SAVENAME));
|
||
csf->setFilePointer(fe, 0, NULL, FILE_BEGIN);
|
||
DWORD length;
|
||
csf->writeFile(fe, ba.data, ba.length, &length );
|
||
|
||
delete [] ba.data;
|
||
|
||
csf->closeHandle(fe);
|
||
}
|
||
}
|
||
}
|
||
|
||
void MinecraftServer::Suspend()
|
||
{
|
||
PIXBeginNamedEvent(0,"Suspending server");
|
||
m_suspending = true;
|
||
// Get the frequency of the timer
|
||
LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
|
||
float fElapsedTime = 0.0f;
|
||
QueryPerformanceFrequency( &qwTicksPerSec );
|
||
float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
|
||
// Save the start time
|
||
QueryPerformanceCounter( &qwTime );
|
||
if(m_bLoaded && ProfileManager.IsFullVersion() && (!StorageManager.GetSaveDisabled()))
|
||
{
|
||
if (players != NULL)
|
||
{
|
||
players->saveAll(NULL);
|
||
}
|
||
for (unsigned int j = 0; j < levels.length; j++)
|
||
{
|
||
if( s_bServerHalted ) break;
|
||
// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
|
||
// with the data from the nethers leveldata.
|
||
// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
|
||
ServerLevel *level = levels[levels.length - 1 - j];
|
||
level->Suspend();
|
||
}
|
||
if( !s_bServerHalted )
|
||
{
|
||
saveGameRules();
|
||
levels[0]->saveToDisc(NULL, true);
|
||
}
|
||
}
|
||
QueryPerformanceCounter( &qwNewTime );
|
||
|
||
qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
|
||
fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
|
||
|
||
// 4J-JEV: Flush stats and call PlayerSessionExit.
|
||
for (int iPad = 0; iPad < XUSER_MAX_COUNT; iPad++)
|
||
{
|
||
if (ProfileManager.IsSignedIn(iPad))
|
||
{
|
||
TelemetryManager->RecordPlayerSessionExit(iPad, DisconnectPacket::eDisconnect_Quitting);
|
||
}
|
||
}
|
||
|
||
m_suspending = false;
|
||
app.DebugPrintf("Suspend server: Elapsed time %f\n", fElapsedTime);
|
||
PIXEndNamedEvent();
|
||
}
|
||
|
||
bool MinecraftServer::IsSuspending()
|
||
{
|
||
return m_suspending;
|
||
}
|
||
|
||
void MinecraftServer::stopServer(bool didInit)
|
||
{
|
||
|
||
// 4J-PB - need to halt the rendering of the data, since we're about to remove it
|
||
#ifdef __PS3__
|
||
if( ShutdownManager::ShouldRun(ShutdownManager::eServerThread ) ) // This thread will take itself out if we are shutting down
|
||
#endif
|
||
{
|
||
Minecraft::GetInstance()->gameRenderer->DisableUpdateThread();
|
||
}
|
||
|
||
connection->stop();
|
||
|
||
app.DebugPrintf("Stopping server\n");
|
||
// logger.info("Stopping server");
|
||
// 4J-PB - If the primary player has signed out, then don't attempt to save anything
|
||
|
||
// also need to check for a profile switch here - primary player signs out, and another player signs in before dismissing the dash
|
||
#ifdef _DURANGO
|
||
// On Durango check if the primary user is signed in OR mid-sign-out
|
||
if(ProfileManager.GetUser(0, true) != nullptr)
|
||
#else
|
||
if((m_bPrimaryPlayerSignedOut==false) && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()))
|
||
#endif
|
||
{
|
||
#if defined(_XBOX_ONE) || defined(__ORBIS__)
|
||
// Always save on exit! Except if saves are disabled.
|
||
if(!saveOnExitAnswered()) m_saveOnExit = true;
|
||
#endif
|
||
// if trial version or saving is disabled, then don't save anything. Also don't save anything if we didn't actually get through the server initialisation.
|
||
if(m_saveOnExit && ProfileManager.IsFullVersion() && (!StorageManager.GetSaveDisabled()) && didInit)
|
||
{
|
||
if (players != NULL)
|
||
{
|
||
players->saveAll(Minecraft::GetInstance()->progressRenderer, true);
|
||
}
|
||
// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
|
||
// with the data from the nethers leveldata.
|
||
// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
|
||
//for (unsigned int i = levels.length - 1; i >= 0; i--)
|
||
//{
|
||
// ServerLevel *level = levels[i];
|
||
// if (level != NULL)
|
||
// {
|
||
saveAllChunks();
|
||
// }
|
||
//}
|
||
|
||
saveGameRules();
|
||
app.m_gameRules.unloadCurrentGameRules();
|
||
if( levels[0] != NULL ) // This can be null if stopServer happens very quickly due to network error
|
||
{
|
||
levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, false);
|
||
}
|
||
}
|
||
}
|
||
// reset the primary player signout flag
|
||
m_bPrimaryPlayerSignedOut=false;
|
||
s_bServerHalted = false;
|
||
|
||
// On Durango/Orbis, we need to wait for all the asynchronous saving processes to complete before destroying the levels, as that will ultimately delete
|
||
// the directory level storage & therefore the ConsoleSaveSplit instance, which needs to be around until all the sub files have completed saving.
|
||
#if defined(_DURANGO) || defined(__ORBIS__) || defined(__PSVITA__)
|
||
while(StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle )
|
||
{
|
||
Sleep(10);
|
||
}
|
||
#endif
|
||
|
||
// 4J-PB remove the server levels
|
||
unsigned int iServerLevelC=levels.length;
|
||
for (unsigned int i = 0; i < iServerLevelC; i++)
|
||
{
|
||
if(levels[i]!=NULL)
|
||
{
|
||
delete levels[i];
|
||
levels[i] = NULL;
|
||
}
|
||
}
|
||
|
||
#if defined(__PS3__) || defined(__ORBIS__)
|
||
// Clear the update flags as it's possible they could be out of sync, causing a crash when starting a new world after the first new level ticks
|
||
// Fix for PS3 #1538 - [IN GAME] If the user 'Exit without saving' from inside the Nether or The End, the title can hang when loading back into the save.
|
||
#endif
|
||
|
||
delete connection;
|
||
connection = NULL;
|
||
delete players;
|
||
players = NULL;
|
||
delete settings;
|
||
settings = NULL;
|
||
|
||
g_NetworkManager.ServerStopped();
|
||
}
|
||
|
||
void MinecraftServer::halt()
|
||
{
|
||
running = false;
|
||
}
|
||
|
||
void MinecraftServer::setMaxBuildHeight(int maxBuildHeight)
|
||
{
|
||
this->maxBuildHeight = maxBuildHeight;
|
||
}
|
||
|
||
int MinecraftServer::getMaxBuildHeight()
|
||
{
|
||
return maxBuildHeight;
|
||
}
|
||
|
||
PlayerList *MinecraftServer::getPlayers()
|
||
{
|
||
return players;
|
||
}
|
||
|
||
void MinecraftServer::setPlayers(PlayerList *players)
|
||
{
|
||
this->players = players;
|
||
}
|
||
|
||
ServerConnection *MinecraftServer::getConnection()
|
||
{
|
||
return connection;
|
||
}
|
||
|
||
bool MinecraftServer::isAnimals()
|
||
{
|
||
return animals;
|
||
}
|
||
|
||
void MinecraftServer::setAnimals(bool animals)
|
||
{
|
||
this->animals = animals;
|
||
}
|
||
|
||
bool MinecraftServer::isNpcsEnabled()
|
||
{
|
||
return npcs;
|
||
}
|
||
|
||
void MinecraftServer::setNpcsEnabled(bool npcs)
|
||
{
|
||
this->npcs = npcs;
|
||
}
|
||
|
||
bool MinecraftServer::isPvpAllowed()
|
||
{
|
||
return pvp;
|
||
}
|
||
|
||
void MinecraftServer::setPvpAllowed(bool pvp)
|
||
{
|
||
this->pvp = pvp;
|
||
}
|
||
|
||
bool MinecraftServer::isFlightAllowed()
|
||
{
|
||
return allowFlight;
|
||
}
|
||
|
||
void MinecraftServer::setFlightAllowed(bool allowFlight)
|
||
{
|
||
this->allowFlight = allowFlight;
|
||
}
|
||
|
||
bool MinecraftServer::isCommandBlockEnabled()
|
||
{
|
||
return false; //settings.getBoolean("enable-command-block", false);
|
||
}
|
||
|
||
bool MinecraftServer::isNetherEnabled()
|
||
{
|
||
return true; //settings.getBoolean("allow-nether", true);
|
||
}
|
||
|
||
bool MinecraftServer::isHardcore()
|
||
{
|
||
return false;
|
||
}
|
||
|
||
int MinecraftServer::getOperatorUserPermissionLevel()
|
||
{
|
||
return Command::LEVEL_OWNERS; //settings.getInt("op-permission-level", Command.LEVEL_OWNERS);
|
||
}
|
||
|
||
CommandDispatcher *MinecraftServer::getCommandDispatcher()
|
||
{
|
||
return commandDispatcher;
|
||
}
|
||
|
||
Pos *MinecraftServer::getCommandSenderWorldPosition()
|
||
{
|
||
return new Pos(0, 0, 0);
|
||
}
|
||
|
||
Level *MinecraftServer::getCommandSenderWorld()
|
||
{
|
||
return levels[0];
|
||
}
|
||
|
||
int MinecraftServer::getSpawnProtectionRadius()
|
||
{
|
||
return 16;
|
||
}
|
||
|
||
bool MinecraftServer::isUnderSpawnProtection(Level *level, int x, int y, int z, shared_ptr<Player> player)
|
||
{
|
||
if (level->dimension->id != 0) return false;
|
||
//if (getPlayers()->getOps()->empty()) return false;
|
||
if (getPlayers()->isOp(player->getName())) return false;
|
||
if (getSpawnProtectionRadius() <= 0) return false;
|
||
|
||
Pos *spawnPos = level->getSharedSpawnPos();
|
||
int xd = Mth::abs(x - spawnPos->x);
|
||
int zd = Mth::abs(z - spawnPos->z);
|
||
int dist = max(xd, zd);
|
||
|
||
return dist <= getSpawnProtectionRadius();
|
||
}
|
||
|
||
void MinecraftServer::setForceGameType(bool forceGameType)
|
||
{
|
||
this->forceGameType = forceGameType;
|
||
}
|
||
|
||
bool MinecraftServer::getForceGameType()
|
||
{
|
||
return forceGameType;
|
||
}
|
||
|
||
int64_t MinecraftServer::getCurrentTimeMillis()
|
||
{
|
||
return System::currentTimeMillis();
|
||
}
|
||
|
||
int MinecraftServer::getPlayerIdleTimeout()
|
||
{
|
||
return playerIdleTimeout;
|
||
}
|
||
|
||
void MinecraftServer::setPlayerIdleTimeout(int playerIdleTimeout)
|
||
{
|
||
this->playerIdleTimeout = playerIdleTimeout;
|
||
}
|
||
|
||
extern int c0a, c0b, c1a, c1b, c1c, c2a, c2b;
|
||
void MinecraftServer::run(int64_t seed, void *lpParameter)
|
||
{
|
||
NetworkGameInitData *initData = NULL;
|
||
DWORD initSettings = 0;
|
||
bool findSeed = false;
|
||
if(lpParameter != NULL)
|
||
{
|
||
initData = (NetworkGameInitData *)lpParameter;
|
||
initSettings = app.GetGameHostOption(eGameHostOption_All);
|
||
findSeed = initData->findSeed;
|
||
m_texturePackId = initData->texturePackId;
|
||
}
|
||
// try { // 4J - removed try/catch/finally
|
||
bool didInit = false;
|
||
if (initServer(seed, initData, initSettings,findSeed))
|
||
{
|
||
didInit = true;
|
||
ServerLevel *levelNormalDimension = levels[0];
|
||
// 4J-PB - Set the Stronghold position in the leveldata if there isn't one in there
|
||
Minecraft *pMinecraft = Minecraft::GetInstance();
|
||
LevelData *pLevelData=levelNormalDimension->getLevelData();
|
||
|
||
if(pLevelData && pLevelData->getHasStronghold()==false)
|
||
{
|
||
int x,z;
|
||
if(app.GetTerrainFeaturePosition(eTerrainFeature_Stronghold,&x,&z))
|
||
{
|
||
pLevelData->setXStronghold(x);
|
||
pLevelData->setZStronghold(z);
|
||
pLevelData->setHasStronghold();
|
||
}
|
||
}
|
||
|
||
int64_t lastTime = getCurrentTimeMillis();
|
||
int64_t unprocessedTime = 0;
|
||
while (running && !s_bServerHalted)
|
||
{
|
||
int64_t now = getCurrentTimeMillis();
|
||
|
||
// 4J Stu - When we pause the server, we don't want to count that as time passed
|
||
// 4J Stu - TU-1 hotifx - Remove this line. We want to make sure that we tick connections at the proper rate when paused
|
||
//Fix for #13191 - The host of a game can get a message informing them that the connection to the server has been lost
|
||
//if(m_isServerPaused) lastTime = now;
|
||
|
||
int64_t passedTime = now - lastTime;
|
||
if (passedTime > MS_PER_TICK * 40)
|
||
{
|
||
// logger.warning("Can't keep up! Did the system time change, or is the server overloaded?");
|
||
passedTime = MS_PER_TICK * 40;
|
||
}
|
||
if (passedTime < 0)
|
||
{
|
||
// logger.warning("Time ran backwards! Did the system time change?");
|
||
passedTime = 0;
|
||
}
|
||
unprocessedTime += passedTime;
|
||
lastTime = now;
|
||
|
||
// 4J Added ability to pause the server
|
||
if( !m_isServerPaused )
|
||
{
|
||
bool didTick = false;
|
||
if (levels[0]->allPlayersAreSleeping())
|
||
{
|
||
tick();
|
||
unprocessedTime = 0;
|
||
}
|
||
else
|
||
{
|
||
// int tickcount = 0;
|
||
// int64_t beforeall = System::currentTimeMillis();
|
||
while (unprocessedTime > MS_PER_TICK)
|
||
{
|
||
unprocessedTime -= MS_PER_TICK;
|
||
chunkPacketManagement_PreTick();
|
||
// int64_t before = System::currentTimeMillis();
|
||
tick();
|
||
// int64_t after = System::currentTimeMillis();
|
||
// PIXReportCounter(L"Server time",(float)(after-before));
|
||
|
||
chunkPacketManagement_PostTick();
|
||
}
|
||
// int64_t afterall = System::currentTimeMillis();
|
||
// PIXReportCounter(L"Server time all",(float)(afterall-beforeall));
|
||
// PIXReportCounter(L"Server ticks",(float)tickcount);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
// 4J Stu - TU1-hotfix
|
||
//Fix for #13191 - The host of a game can get a message informing them that the connection to the server has been lost
|
||
// The connections should tick at the same frequency even when paused
|
||
while (unprocessedTime > MS_PER_TICK)
|
||
{
|
||
unprocessedTime -= MS_PER_TICK;
|
||
// Keep ticking the connections to stop them timing out
|
||
connection->tick();
|
||
}
|
||
}
|
||
if(MinecraftServer::setTimeAtEndOfTick)
|
||
{
|
||
MinecraftServer::setTimeAtEndOfTick = false;
|
||
for (unsigned int i = 0; i < levels.length; i++)
|
||
{
|
||
// if (i == 0 || settings->getBoolean(L"allow-nether", true)) // 4J removed - we always have nether
|
||
{
|
||
ServerLevel *level = levels[i];
|
||
level->setGameTime( MinecraftServer::setTime );
|
||
}
|
||
}
|
||
}
|
||
if(MinecraftServer::setTimeOfDayAtEndOfTick)
|
||
{
|
||
MinecraftServer::setTimeOfDayAtEndOfTick = false;
|
||
for (unsigned int i = 0; i < levels.length; i++)
|
||
{
|
||
if (i == 0 || GetDedicatedServerBool(settings, L"allow-nether", true))
|
||
{
|
||
ServerLevel *level = levels[i];
|
||
level->setDayTime( MinecraftServer::setTimeOfDay );
|
||
}
|
||
}
|
||
}
|
||
|
||
// Process delayed actions
|
||
eXuiServerAction eAction;
|
||
LPVOID param;
|
||
for(int i=0;i<XUSER_MAX_COUNT;i++)
|
||
{
|
||
eAction = app.GetXuiServerAction(i);
|
||
param = app.GetXuiServerActionParam(i);
|
||
|
||
switch(eAction)
|
||
{
|
||
case eXuiServerAction_AutoSaveGame:
|
||
#if defined(_XBOX_ONE) || defined(__ORBIS__)
|
||
{
|
||
PIXBeginNamedEvent(0,"Autosave");
|
||
|
||
// Get the frequency of the timer
|
||
LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
|
||
float fElapsedTime = 0.0f;
|
||
QueryPerformanceFrequency( &qwTicksPerSec );
|
||
float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
|
||
|
||
// Save the start time
|
||
QueryPerformanceCounter( &qwTime );
|
||
|
||
if (players != NULL)
|
||
{
|
||
players->saveAll(NULL);
|
||
}
|
||
|
||
for (unsigned int j = 0; j < levels.length; j++)
|
||
{
|
||
if( s_bServerHalted ) break;
|
||
// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
|
||
// with the data from the nethers leveldata.
|
||
// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
|
||
ServerLevel *level = levels[levels.length - 1 - j];
|
||
PIXBeginNamedEvent(0, "Saving level %d",levels.length - 1 - j);
|
||
level->save(false, NULL, true);
|
||
PIXEndNamedEvent();
|
||
}
|
||
if( !s_bServerHalted )
|
||
{
|
||
PIXBeginNamedEvent(0,"Saving game rules");
|
||
saveGameRules();
|
||
PIXEndNamedEvent();
|
||
|
||
PIXBeginNamedEvent(0,"Save to disc");
|
||
levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, true);
|
||
PIXEndNamedEvent();
|
||
}
|
||
PIXEndNamedEvent();
|
||
|
||
QueryPerformanceCounter( &qwNewTime );
|
||
qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
|
||
fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
|
||
app.DebugPrintf("Autosave: Elapsed time %f\n", fElapsedTime);
|
||
}
|
||
break;
|
||
#endif
|
||
case eXuiServerAction_SaveGame:
|
||
app.EnterSaveNotificationSection();
|
||
if (players != NULL)
|
||
{
|
||
players->saveAll(Minecraft::GetInstance()->progressRenderer);
|
||
}
|
||
|
||
players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(20) ) );
|
||
|
||
for (unsigned int j = 0; j < levels.length; j++)
|
||
{
|
||
if( s_bServerHalted ) break;
|
||
// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
|
||
// with the data from the nethers leveldata.
|
||
// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
|
||
ServerLevel *level = levels[levels.length - 1 - j];
|
||
level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
|
||
|
||
players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(33 + (j*33) ) ) );
|
||
}
|
||
if( !s_bServerHalted )
|
||
{
|
||
saveGameRules();
|
||
|
||
levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
|
||
}
|
||
app.LeaveSaveNotificationSection();
|
||
break;
|
||
case eXuiServerAction_DropItem:
|
||
// Find the player, and drop the id at their feet
|
||
{
|
||
shared_ptr<ServerPlayer> player = players->players.at(0);
|
||
size_t id = (size_t) param;
|
||
player->drop( shared_ptr<ItemInstance>( new ItemInstance(id, 1, 0 ) ) );
|
||
}
|
||
break;
|
||
case eXuiServerAction_SpawnMob:
|
||
{
|
||
shared_ptr<ServerPlayer> player = players->players.at(0);
|
||
eINSTANCEOF factory = (eINSTANCEOF)((size_t)param);
|
||
shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(EntityIO::newByEnumType(factory,player->level ));
|
||
mob->moveTo(player->x+1, player->y, player->z+1, player->level->random->nextFloat() * 360, 0);
|
||
mob->setDespawnProtected(); // 4J added, default to being protected against despawning (has to be done after initial position is set)
|
||
player->level->addEntity(mob);
|
||
}
|
||
break;
|
||
case eXuiServerAction_PauseServer:
|
||
m_isServerPaused = ( (size_t) param == TRUE );
|
||
if( m_isServerPaused )
|
||
{
|
||
m_serverPausedEvent->Set();
|
||
}
|
||
break;
|
||
case eXuiServerAction_ToggleRain:
|
||
{
|
||
bool isRaining = levels[0]->getLevelData()->isRaining();
|
||
levels[0]->getLevelData()->setRaining(!isRaining);
|
||
levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
|
||
}
|
||
break;
|
||
case eXuiServerAction_ToggleThunder:
|
||
{
|
||
bool isThundering = levels[0]->getLevelData()->isThundering();
|
||
levels[0]->getLevelData()->setThundering(!isThundering);
|
||
levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
|
||
}
|
||
break;
|
||
case eXuiServerAction_ServerSettingChanged_Gamertags:
|
||
players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)) ) );
|
||
break;
|
||
case eXuiServerAction_ServerSettingChanged_BedrockFog:
|
||
players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)) ) );
|
||
break;
|
||
|
||
case eXuiServerAction_ServerSettingChanged_Difficulty:
|
||
players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty) ) );
|
||
break;
|
||
case eXuiServerAction_ExportSchematic:
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.EnterSaveNotificationSection();
|
||
|
||
//players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(20) ) );
|
||
|
||
if( !s_bServerHalted )
|
||
{
|
||
ConsoleSchematicFile::XboxSchematicInitParam *initData = (ConsoleSchematicFile::XboxSchematicInitParam *)param;
|
||
#ifdef _XBOX
|
||
File targetFileDir(File::pathRoot + File::pathSeparator + L"Schematics");
|
||
#else
|
||
File targetFileDir(L"Schematics");
|
||
#endif
|
||
if(!targetFileDir.exists()) targetFileDir.mkdir();
|
||
|
||
wchar_t filename[128];
|
||
swprintf(filename,128,L"%ls%dx%dx%d.sch",initData->name,(initData->endX - initData->startX + 1), (initData->endY - initData->startY + 1), (initData->endZ - initData->startZ + 1));
|
||
|
||
File dataFile = File( targetFileDir, wstring(filename) );
|
||
if(dataFile.exists()) dataFile._delete();
|
||
FileOutputStream fos = FileOutputStream(dataFile);
|
||
DataOutputStream dos = DataOutputStream(&fos);
|
||
ConsoleSchematicFile::generateSchematicFile(&dos, levels[0], initData->startX, initData->startY, initData->startZ, initData->endX, initData->endY, initData->endZ, initData->bSaveMobs, initData->compressionType);
|
||
dos.close();
|
||
|
||
delete initData;
|
||
}
|
||
app.LeaveSaveNotificationSection();
|
||
#endif
|
||
break;
|
||
case eXuiServerAction_SetCameraLocation:
|
||
#ifndef _CONTENT_PACKAGE
|
||
{
|
||
DebugSetCameraPosition *pos = (DebugSetCameraPosition *)param;
|
||
|
||
app.DebugPrintf( "DEBUG: Player=%i\n", pos->player );
|
||
app.DebugPrintf( "DEBUG: Teleporting to pos=(%f.2, %f.2, %f.2), looking at=(%f.2,%f.2)\n",
|
||
pos->m_camX, pos->m_camY, pos->m_camZ,
|
||
pos->m_yRot, pos->m_elev
|
||
);
|
||
|
||
shared_ptr<ServerPlayer> player = players->players.at(pos->player);
|
||
player->debug_setPosition( pos->m_camX, pos->m_camY, pos->m_camZ,
|
||
pos->m_yRot, pos->m_elev );
|
||
|
||
// Doesn't work
|
||
//player->setYHeadRot(pos->m_yRot);
|
||
//player->absMoveTo(pos->m_camX, pos->m_camY, pos->m_camZ, pos->m_yRot, pos->m_elev);
|
||
}
|
||
#endif
|
||
break;
|
||
}
|
||
|
||
app.SetXuiServerAction(i,eXuiServerAction_Idle);
|
||
}
|
||
|
||
Sleep(1);
|
||
}
|
||
}
|
||
//else
|
||
//{
|
||
// while (running)
|
||
// {
|
||
// handleConsoleInputs();
|
||
// Sleep(10);
|
||
// }
|
||
//}
|
||
#if 0
|
||
} catch (Throwable t) {
|
||
t.printStackTrace();
|
||
logger.log(Level.SEVERE, "Unexpected exception", t);
|
||
while (running) {
|
||
handleConsoleInputs();
|
||
try {
|
||
Thread.sleep(10);
|
||
} catch (InterruptedException e1) {
|
||
e1.printStackTrace();
|
||
}
|
||
}
|
||
} finally {
|
||
try {
|
||
stopServer();
|
||
stopped = true;
|
||
} catch (Throwable t) {
|
||
t.printStackTrace();
|
||
} finally {
|
||
System::exit(0);
|
||
}
|
||
}
|
||
#endif
|
||
|
||
// 4J Stu - Stop the server when the loops complete, as the finally would do
|
||
stopServer(didInit);
|
||
stopped = true;
|
||
}
|
||
|
||
void MinecraftServer::broadcastStartSavingPacket()
|
||
{
|
||
players->broadcastAll( shared_ptr<GameEventPacket>( new GameEventPacket(GameEventPacket::START_SAVING, 0) ) );;
|
||
}
|
||
|
||
void MinecraftServer::broadcastStopSavingPacket()
|
||
{
|
||
if( !s_bServerHalted )
|
||
{
|
||
players->broadcastAll( shared_ptr<GameEventPacket>( new GameEventPacket(GameEventPacket::STOP_SAVING, 0) ) );;
|
||
}
|
||
}
|
||
|
||
void MinecraftServer::tick()
|
||
{
|
||
vector<wstring> toRemove;
|
||
for ( auto& it : ironTimers )
|
||
{
|
||
int t = it.second;
|
||
if (t > 0)
|
||
{
|
||
ironTimers[it.first] = t - 1;
|
||
}
|
||
else
|
||
{
|
||
toRemove.push_back(it.first);
|
||
}
|
||
}
|
||
for (const auto& i : toRemove)
|
||
{
|
||
ironTimers.erase(i);
|
||
}
|
||
|
||
AABB::resetPool();
|
||
Vec3::resetPool();
|
||
|
||
tickCount++;
|
||
|
||
// 4J We need to update client difficulty levels based on the servers
|
||
Minecraft *pMinecraft = Minecraft::GetInstance();
|
||
// 4J-PB - sending this on the host changing the difficulty in the menus
|
||
/* if(m_lastSentDifficulty != pMinecraft->options->difficulty)
|
||
{
|
||
m_lastSentDifficulty = pMinecraft->options->difficulty;
|
||
players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_DIFFICULTY, pMinecraft->options->difficulty) ) );
|
||
}*/
|
||
|
||
for (unsigned int i = 0; i < levels.length; i++)
|
||
{
|
||
// if (i == 0 || settings->getBoolean(L"allow-nether", true)) // 4J removed - we always have nether
|
||
{
|
||
ServerLevel *level = levels[i];
|
||
|
||
// 4J Stu - We set the levels difficulty based on the minecraft options
|
||
level->difficulty = app.GetGameHostOption(eGameHostOption_Difficulty); //pMinecraft->options->difficulty;
|
||
|
||
#if DEBUG_SERVER_DONT_SPAWN_MOBS
|
||
level->setSpawnSettings(false, false);
|
||
#else
|
||
level->setSpawnSettings(level->difficulty > 0 && !Minecraft::GetInstance()->isTutorial(), animals);
|
||
#endif
|
||
|
||
if (tickCount % 20 == 0)
|
||
{
|
||
players->broadcastAll( shared_ptr<SetTimePacket>( new SetTimePacket(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT) ) ), level->dimension->id);
|
||
}
|
||
// #ifndef __PS3__
|
||
static int64_t stc = 0;
|
||
int64_t st0 = System::currentTimeMillis();
|
||
PIXBeginNamedEvent(0,"Level tick %d",i);
|
||
((Level *)level)->tick();
|
||
int64_t st1 = System::currentTimeMillis();
|
||
PIXEndNamedEvent();
|
||
PIXBeginNamedEvent(0,"Update lights %d",i);
|
||
|
||
int64_t st2 = System::currentTimeMillis();
|
||
PIXEndNamedEvent();
|
||
PIXBeginNamedEvent(0,"Entity tick %d",i);
|
||
// 4J added to stop ticking entities in levels when players are not in those levels.
|
||
// Note: now changed so that we also tick if there are entities to be removed, as this also happens as a result of calling tickEntities. If we don't do this, then the
|
||
// entities get removed at the first point that there is a player count in the level - this has been causing a problem when going from normal dimension -> nether -> normal,
|
||
// as the player is getting flagged as to be removed (from the normal dimension) when going to the nether, but Actually gets removed only when it returns
|
||
if( ( players->getPlayerCount(level) > 0) || ( level->hasEntitiesToRemove() ) )
|
||
{
|
||
#ifdef __PSVITA__
|
||
// AP - the PlayerList->viewDistance initially starts out at 3 to make starting a level speedy
|
||
// the problem with this is that spawned monsters are always generated on the edge of the known map
|
||
// which means they wont process (unless they are surrounded by 2 visible chunks). This means
|
||
// they wont checkDespawn so they are NEVER removed which results in monsters not spawning.
|
||
// This bit of hack will modify the view distance once the level is up and running.
|
||
int newViewDistance = 5;
|
||
level->getServer()->getPlayers()->setViewDistance(newViewDistance);
|
||
level->getTracker()->updateMaxRange();
|
||
level->getChunkMap()->setRadius(level->getServer()->getPlayers()->getViewDistance());
|
||
#endif
|
||
level->tickEntities();
|
||
}
|
||
PIXEndNamedEvent();
|
||
|
||
PIXBeginNamedEvent(0,"Entity tracker tick");
|
||
level->getTracker()->tick();
|
||
PIXEndNamedEvent();
|
||
|
||
int64_t st3 = System::currentTimeMillis();
|
||
// printf(">>>>>>>>>>>>>>>>>>>>>> Tick %d %d %d : %d\n", st1 - st0, st2 - st1, st3 - st2, st0 - stc );
|
||
stc = st0;
|
||
// #endif// __PS3__
|
||
}
|
||
}
|
||
Entity::tickExtraWandering(); // 4J added
|
||
|
||
// Process player disconnect/kick queue BEFORE ticking connections.
|
||
// PendingConnection::handleLogin rejects duplicate XUIDs, so the old
|
||
// player must be removed from PlayerList before a reconnecting client's
|
||
// LoginPacket is processed.
|
||
PIXBeginNamedEvent(0,"Players tick");
|
||
players->tick();
|
||
PIXEndNamedEvent();
|
||
PIXBeginNamedEvent(0,"Connection tick");
|
||
connection->tick();
|
||
PIXEndNamedEvent();
|
||
|
||
// 4J - removed
|
||
#if 0
|
||
for (int i = 0; i < tickables.size(); i++) {
|
||
tickables.get(i)-tick();
|
||
}
|
||
#endif
|
||
|
||
// try { // 4J - removed try/catch
|
||
handleConsoleInputs();
|
||
// } catch (Exception e) {
|
||
// logger.log(Level.WARNING, "Unexpected exception while parsing console command", e);
|
||
// }
|
||
}
|
||
|
||
void MinecraftServer::handleConsoleInput(const wstring& msg, ConsoleInputSource *source)
|
||
{
|
||
EnterCriticalSection(&m_consoleInputCS);
|
||
consoleInput.push_back(new ConsoleInput(msg, source));
|
||
LeaveCriticalSection(&m_consoleInputCS);
|
||
}
|
||
|
||
void MinecraftServer::handleConsoleInputs()
|
||
{
|
||
vector<ConsoleInput *> pendingInputs;
|
||
EnterCriticalSection(&m_consoleInputCS);
|
||
pendingInputs.swap(consoleInput);
|
||
LeaveCriticalSection(&m_consoleInputCS);
|
||
|
||
for (size_t i = 0; i < pendingInputs.size(); ++i)
|
||
{
|
||
ConsoleInput *input = pendingInputs[i];
|
||
ExecuteConsoleCommand(this, input->msg);
|
||
delete input;
|
||
}
|
||
}
|
||
|
||
void MinecraftServer::main(int64_t seed, void *lpParameter)
|
||
{
|
||
#if __PS3__
|
||
ShutdownManager::HasStarted(ShutdownManager::eServerThread );
|
||
#endif
|
||
server = new MinecraftServer();
|
||
server->run(seed, lpParameter);
|
||
delete server;
|
||
server = NULL;
|
||
ShutdownManager::HasFinished(ShutdownManager::eServerThread );
|
||
}
|
||
|
||
void MinecraftServer::HaltServer(bool bPrimaryPlayerSignedOut)
|
||
{
|
||
s_bServerHalted = true;
|
||
if( server != NULL )
|
||
{
|
||
m_bPrimaryPlayerSignedOut=bPrimaryPlayerSignedOut;
|
||
server->halt();
|
||
}
|
||
}
|
||
|
||
File *MinecraftServer::getFile(const wstring& name)
|
||
{
|
||
return new File(name);
|
||
}
|
||
|
||
void MinecraftServer::info(const wstring& string)
|
||
{
|
||
PrintConsoleLine(L"[INFO] ", string);
|
||
}
|
||
|
||
void MinecraftServer::warn(const wstring& string)
|
||
{
|
||
PrintConsoleLine(L"[WARN] ", string);
|
||
}
|
||
|
||
wstring MinecraftServer::getConsoleName()
|
||
{
|
||
return L"CONSOLE";
|
||
}
|
||
|
||
ServerLevel *MinecraftServer::getLevel(int dimension)
|
||
{
|
||
if (dimension == -1) return levels[1];
|
||
else if (dimension == 1) return levels[2];
|
||
else return levels[0];
|
||
}
|
||
|
||
// 4J added
|
||
void MinecraftServer::setLevel(int dimension, ServerLevel *level)
|
||
{
|
||
if (dimension == -1) levels[1] = level;
|
||
else if (dimension == 1) levels[2] = level;
|
||
else levels[0] = level;
|
||
}
|
||
|
||
#if defined _ACK_CHUNK_SEND_THROTTLING
|
||
bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
|
||
{
|
||
if( s_hasSentEnoughPackets ) return false;
|
||
if( player == NULL ) return false;
|
||
|
||
for( int i = 0; i < s_sentTo.size(); i++ )
|
||
{
|
||
if( s_sentTo[i]->IsSameSystem(player) )
|
||
{
|
||
return false;
|
||
}
|
||
}
|
||
|
||
#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
|
||
return ( player->GetOutstandingAckCount() < 3 );
|
||
#else
|
||
return ( player->GetOutstandingAckCount() < 2 );
|
||
#endif
|
||
}
|
||
|
||
void MinecraftServer::chunkPacketManagement_DidSendTo(INetworkPlayer *player)
|
||
{
|
||
int64_t currentTime = System::currentTimeMillis();
|
||
|
||
if( ( currentTime - s_tickStartTime ) >= MAX_TICK_TIME_FOR_PACKET_SENDS )
|
||
{
|
||
s_hasSentEnoughPackets = true;
|
||
// app.DebugPrintf("Sending, setting enough packet flag: %dms\n",currentTime - s_tickStartTime);
|
||
}
|
||
else
|
||
{
|
||
// app.DebugPrintf("Sending, more time: %dms\n",currentTime - s_tickStartTime);
|
||
}
|
||
|
||
player->SentChunkPacket();
|
||
|
||
s_sentTo.push_back(player);
|
||
}
|
||
|
||
void MinecraftServer::chunkPacketManagement_PreTick()
|
||
{
|
||
// app.DebugPrintf("*************************************************************************************************************************************************************************\n");
|
||
s_hasSentEnoughPackets = false;
|
||
s_tickStartTime = System::currentTimeMillis();
|
||
s_sentTo.clear();
|
||
|
||
vector< shared_ptr<PlayerConnection> > *players = connection->getPlayers();
|
||
|
||
if( players->size() )
|
||
{
|
||
vector< shared_ptr<PlayerConnection> > playersOrig = *players;
|
||
players->clear();
|
||
|
||
do
|
||
{
|
||
int longestTime = 0;
|
||
auto playerConnectionBest = playersOrig.begin();
|
||
for( auto it = playersOrig.begin(); it != playersOrig.end(); it++)
|
||
{
|
||
int thisTime = 0;
|
||
INetworkPlayer *np = (*it)->getNetworkPlayer();
|
||
if( np )
|
||
{
|
||
thisTime = np->GetTimeSinceLastChunkPacket_ms();
|
||
}
|
||
|
||
if( thisTime > longestTime )
|
||
{
|
||
playerConnectionBest = it;
|
||
longestTime = thisTime;
|
||
}
|
||
}
|
||
players->push_back(*playerConnectionBest);
|
||
playersOrig.erase(playerConnectionBest);
|
||
} while ( playersOrig.size() > 0 );
|
||
}
|
||
}
|
||
|
||
void MinecraftServer::chunkPacketManagement_PostTick()
|
||
{
|
||
}
|
||
|
||
#else
|
||
// 4J Added - round-robin chunk sends by player index. Compare vs the player at the current queue index,
|
||
// not GetSessionIndex() (smallId), so reused smallIds after many connect/disconnects still get chunk sends.
|
||
bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
|
||
{
|
||
if( player == NULL ) return false;
|
||
|
||
int time = GetTickCount();
|
||
DWORD currentPlayerCount = g_NetworkManager.GetPlayerCount();
|
||
if( currentPlayerCount == 0 ) return false;
|
||
int index = s_slowQueuePlayerIndex % (int)currentPlayerCount;
|
||
INetworkPlayer *queuePlayer = g_NetworkManager.GetPlayerByIndex( index );
|
||
if( queuePlayer != NULL && (player == queuePlayer || player->IsSameSystem(queuePlayer)) && (time - s_slowQueueLastTime) > MINECRAFT_SERVER_SLOW_QUEUE_DELAY )
|
||
{
|
||
return true;
|
||
}
|
||
|
||
return false;
|
||
}
|
||
|
||
void MinecraftServer::chunkPacketManagement_DidSendTo(INetworkPlayer *player)
|
||
{
|
||
s_slowQueuePacketSent = true;
|
||
}
|
||
|
||
void MinecraftServer::chunkPacketManagement_PreTick()
|
||
{
|
||
}
|
||
|
||
void MinecraftServer::chunkPacketManagement_PostTick()
|
||
{
|
||
// 4J Ensure that the slow queue owner keeps cycling if it's not been used in a while
|
||
int time = GetTickCount();
|
||
if( ( s_slowQueuePacketSent ) || ( (time - s_slowQueueLastTime) > ( 2 * MINECRAFT_SERVER_SLOW_QUEUE_DELAY ) ) )
|
||
{
|
||
// app.DebugPrintf("Considering cycling: (%d) %d - %d -> %d > %d\n",s_slowQueuePacketSent, time, s_slowQueueLastTime, (time - s_slowQueueLastTime), (2*MINECRAFT_SERVER_SLOW_QUEUE_DELAY));
|
||
MinecraftServer::cycleSlowQueueIndex();
|
||
s_slowQueuePacketSent = false;
|
||
s_slowQueueLastTime = time;
|
||
}
|
||
// else
|
||
// {
|
||
// app.DebugPrintf("Not considering cycling: %d - %d -> %d > %d\n",time, s_slowQueueLastTime, (time - s_slowQueueLastTime), (2*MINECRAFT_SERVER_SLOW_QUEUE_DELAY));
|
||
// }
|
||
}
|
||
|
||
void MinecraftServer::cycleSlowQueueIndex()
|
||
{
|
||
if( !g_NetworkManager.IsInSession() ) return;
|
||
|
||
int startingIndex = s_slowQueuePlayerIndex;
|
||
INetworkPlayer *currentPlayer = NULL;
|
||
DWORD currentPlayerCount = 0;
|
||
do
|
||
{
|
||
currentPlayerCount = g_NetworkManager.GetPlayerCount();
|
||
if( startingIndex >= currentPlayerCount ) startingIndex = 0;
|
||
++s_slowQueuePlayerIndex;
|
||
|
||
if( currentPlayerCount > 0 )
|
||
{
|
||
s_slowQueuePlayerIndex %= currentPlayerCount;
|
||
// Fix for #9530 - NETWORKING: Attempting to fill a multiplayer game beyond capacity results in a softlock for the last players to join.
|
||
// The QNet session might be ending while we do this, so do a few more checks that the player is real
|
||
currentPlayer = g_NetworkManager.GetPlayerByIndex( s_slowQueuePlayerIndex );
|
||
}
|
||
else
|
||
{
|
||
s_slowQueuePlayerIndex = 0;
|
||
}
|
||
} while ( g_NetworkManager.IsInSession() &&
|
||
currentPlayerCount > 0 &&
|
||
s_slowQueuePlayerIndex != startingIndex &&
|
||
currentPlayer != NULL &&
|
||
currentPlayer->IsLocal()
|
||
);
|
||
// app.DebugPrintf("Cycled slow queue index to %d\n", s_slowQueuePlayerIndex);
|
||
}
|
||
#endif
|
||
|
||
// 4J added - sets up a vector of flags to indicate which entities (with small Ids) have been removed from the level, but are still haven't constructed a network packet
|
||
// to tell a remote client about it. These small Ids shouldn't be re-used. Most of the time this method shouldn't actually do anything, in which case it will return false
|
||
// and nothing is set up.
|
||
bool MinecraftServer::flagEntitiesToBeRemoved(unsigned int *flags)
|
||
{
|
||
bool removedFound = false;
|
||
for( unsigned int i = 0; i < levels.length; i++ )
|
||
{
|
||
ServerLevel *level = levels[i];
|
||
if( level )
|
||
{
|
||
level->flagEntitiesToBeRemoved( flags, &removedFound );
|
||
}
|
||
}
|
||
return removedFound;
|
||
}
|