mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-03-22 13:39:31 +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.
1670 lines
57 KiB
C++
1670 lines
57 KiB
C++
#include "stdafx.h"
|
||
#include "PlayerList.h"
|
||
|
||
#include <memory>
|
||
#include "PlayerChunkMap.h"
|
||
#include "MinecraftServer.h"
|
||
#include "Settings.h"
|
||
#include "ServerLevel.h"
|
||
#include "ServerChunkCache.h"
|
||
#include "ServerPlayer.h"
|
||
#include "ServerPlayerGameMode.h"
|
||
#include "ServerConnection.h"
|
||
#include "PendingConnection.h"
|
||
#include "PlayerConnection.h"
|
||
#include "EntityTracker.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
|
||
#include "..\Minecraft.World\ArrayWithLength.h"
|
||
#include "..\Minecraft.World\net.minecraft.network.packet.h"
|
||
#include "..\Minecraft.World\net.minecraft.network.h"
|
||
#include "Windows64\Windows64_Xuid.h"
|
||
#ifdef _WINDOWS64
|
||
#include "Windows64\Network\WinsockNetLayer.h"
|
||
#endif
|
||
#include "..\Minecraft.World\Pos.h"
|
||
#include "..\Minecraft.World\ProgressListener.h"
|
||
#include "..\Minecraft.World\HellRandomLevelSource.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.phys.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.item.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
|
||
#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
|
||
#include "..\Minecraft.World\JavaMath.h"
|
||
#include "..\Minecraft.World\EntityIO.h"
|
||
#if defined(_XBOX) || defined(_WINDOWS64)
|
||
#include "Xbox\Network\NetworkPlayerXbox.h"
|
||
#elif defined(__PS3__) || defined(__ORBIS__)
|
||
#include "Common\Network\Sony\NetworkPlayerSony.h"
|
||
#endif
|
||
|
||
// 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc.
|
||
|
||
PlayerList::PlayerList(MinecraftServer *server)
|
||
{
|
||
playerIo = NULL;
|
||
|
||
this->server = server;
|
||
|
||
sendAllPlayerInfoIn = 0;
|
||
overrideGameMode = NULL;
|
||
allowCheatsForAllPlayers = false;
|
||
|
||
#ifdef __PSVITA__
|
||
viewDistance = 3;
|
||
#elif defined _LARGE_WORLDS
|
||
viewDistance = 16;
|
||
#else
|
||
viewDistance = 10;
|
||
#endif
|
||
|
||
//int viewDistance = server->settings->getInt(L"view-distance", 10);
|
||
|
||
int rawMax = server->settings->getInt(L"max-players", 8);
|
||
maxPlayers = (unsigned int)Mth::clamp(rawMax, 1, MINECRAFT_NET_MAX_PLAYERS);
|
||
doWhiteList = false;
|
||
InitializeCriticalSection(&m_kickPlayersCS);
|
||
InitializeCriticalSection(&m_closePlayersCS);
|
||
}
|
||
|
||
PlayerList::~PlayerList()
|
||
{
|
||
for (auto& player : players)
|
||
{
|
||
player->connection = nullptr; // Must remove reference to connection, or else there is a circular dependency
|
||
delete player->gameMode; // Gamemode also needs deleted as it references back to this player
|
||
player->gameMode = nullptr;
|
||
}
|
||
|
||
DeleteCriticalSection(&m_kickPlayersCS);
|
||
DeleteCriticalSection(&m_closePlayersCS);
|
||
}
|
||
|
||
bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer> player, shared_ptr<LoginPacket> packet)
|
||
{
|
||
CompoundTag *playerTag = load(player);
|
||
|
||
bool newPlayer = playerTag == NULL;
|
||
|
||
player->setLevel(server->getLevel(player->dimension));
|
||
player->gameMode->setLevel((ServerLevel *)player->level);
|
||
|
||
// Make sure these privileges are always turned off for the host player
|
||
INetworkPlayer *networkPlayer = connection->getSocket()->getPlayer();
|
||
if(networkPlayer != NULL && networkPlayer->IsHost())
|
||
{
|
||
player->enableAllPlayerPrivileges(true);
|
||
player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_HOST,1);
|
||
}
|
||
|
||
#if defined(__PS3__) || defined(__ORBIS__)
|
||
// PS3 networking library doesn't automatically assign PlayerUIDs to the network players for anything remote, so need to tell it what to set from the data in this packet now
|
||
if( !g_NetworkManager.IsLocalGame() )
|
||
{
|
||
if( networkPlayer != NULL )
|
||
{
|
||
((NetworkPlayerSony *)networkPlayer)->SetUID( packet->m_onlineXuid );
|
||
}
|
||
}
|
||
#endif
|
||
#ifdef _WINDOWS64
|
||
if (networkPlayer != NULL)
|
||
{
|
||
NetworkPlayerXbox* nxp = (NetworkPlayerXbox*)networkPlayer;
|
||
IQNetPlayer* qnp = nxp->GetQNetPlayer();
|
||
if (qnp != NULL)
|
||
{
|
||
if (!networkPlayer->IsLocal())
|
||
{
|
||
wcsncpy_s(qnp->m_gamertag, 32, player->name.c_str(), _TRUNCATE);
|
||
}
|
||
qnp->m_resolvedXuid = player->getXuid();
|
||
}
|
||
}
|
||
#endif
|
||
// 4J Stu - TU-1 hotfix
|
||
// Fix for #13150 - When a player loads/joins a game after saving/leaving in the nether, sometimes they are spawned on top of the nether and cannot mine down
|
||
validatePlayerSpawnPosition(player);
|
||
|
||
// logger.info(getName() + " logged in with entity id " + playerEntity.entityId + " at (" + playerEntity.x + ", " + playerEntity.y + ", " + playerEntity.z + ")");
|
||
|
||
ServerLevel *level = server->getLevel(player->dimension);
|
||
|
||
DWORD playerIndex = (DWORD)MINECRAFT_NET_MAX_PLAYERS;
|
||
{
|
||
bool usedIndexes[MINECRAFT_NET_MAX_PLAYERS];
|
||
ZeroMemory( &usedIndexes, MINECRAFT_NET_MAX_PLAYERS * sizeof(bool) );
|
||
for (auto& p : players )
|
||
{
|
||
usedIndexes[p->getPlayerIndex()] = true;
|
||
}
|
||
for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
|
||
{
|
||
if(!usedIndexes[i])
|
||
{
|
||
playerIndex = i;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
if (playerIndex >= (unsigned int)MINECRAFT_NET_MAX_PLAYERS)
|
||
{
|
||
connection->send(shared_ptr<DisconnectPacket>(new DisconnectPacket(DisconnectPacket::eDisconnect_ServerFull)));
|
||
connection->sendAndQuit();
|
||
return false;
|
||
}
|
||
player->setPlayerIndex( playerIndex );
|
||
player->setCustomSkin( packet->m_playerSkinId );
|
||
player->setCustomCape( packet->m_playerCapeId );
|
||
|
||
// 4J-JEV: Moved this here so we can send player-model texture and geometry data.
|
||
shared_ptr<PlayerConnection> playerConnection = shared_ptr<PlayerConnection>(new PlayerConnection(server, connection, player));
|
||
//player->connection = playerConnection; // Used to be assigned in PlayerConnection ctor but moved out so we can use shared_ptr
|
||
|
||
if(newPlayer)
|
||
{
|
||
int mapScale = 3;
|
||
#ifdef _LARGE_WORLDS
|
||
int scale = MapItemSavedData::MAP_SIZE * 2 * (1 << mapScale);
|
||
int centreXC = (int) (Math::round(player->x / scale) * scale);
|
||
int centreZC = (int) (Math::round(player->z / scale) * scale);
|
||
#else
|
||
// 4J-PB - for Xbox maps, we'll centre them on the origin of the world, since we can fit the whole world in our map
|
||
int centreXC = 0;
|
||
int centreZC = 0;
|
||
#endif
|
||
// 4J Added - Give every player a map the first time they join a server
|
||
player->inventory->setItem( 9, shared_ptr<ItemInstance>( new ItemInstance(Item::map_Id, 1, level->getAuxValueForMap(player->getXuid(),0,centreXC, centreZC, mapScale ) ) ) );
|
||
if(app.getGameRuleDefinitions() != NULL)
|
||
{
|
||
app.getGameRuleDefinitions()->postProcessPlayer(player);
|
||
}
|
||
}
|
||
|
||
if(!player->customTextureUrl.empty() && player->customTextureUrl.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl))
|
||
{
|
||
if( server->getConnection()->addPendingTextureRequest(player->customTextureUrl))
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
wprintf(L"Sending texture packet to get custom skin %ls from player %ls\n",player->customTextureUrl.c_str(), player->name.c_str());
|
||
#endif
|
||
playerConnection->send(shared_ptr<TextureAndGeometryPacket>( new TextureAndGeometryPacket(player->customTextureUrl,NULL,0) ) );
|
||
}
|
||
}
|
||
else if(!player->customTextureUrl.empty() && app.IsFileInMemoryTextures(player->customTextureUrl))
|
||
{
|
||
// Update the ref count on the memory texture data
|
||
app.AddMemoryTextureFile(player->customTextureUrl,NULL,0);
|
||
}
|
||
|
||
if(!player->customTextureUrl2.empty() && player->customTextureUrl2.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl2))
|
||
{
|
||
if( server->getConnection()->addPendingTextureRequest(player->customTextureUrl2))
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
wprintf(L"Sending texture packet to get custom skin %ls from player %ls\n",player->customTextureUrl2.c_str(), player->name.c_str());
|
||
#endif
|
||
playerConnection->send(shared_ptr<TexturePacket>( new TexturePacket(player->customTextureUrl2,NULL,0) ) );
|
||
}
|
||
}
|
||
else if(!player->customTextureUrl2.empty() && app.IsFileInMemoryTextures(player->customTextureUrl2))
|
||
{
|
||
// Update the ref count on the memory texture data
|
||
app.AddMemoryTextureFile(player->customTextureUrl2,NULL,0);
|
||
}
|
||
|
||
player->setIsGuest( packet->m_isGuest );
|
||
|
||
Pos *spawnPos = level->getSharedSpawnPos();
|
||
|
||
updatePlayerGameMode(player, nullptr, level);
|
||
|
||
// Update the privileges with the correct game mode
|
||
GameType *gameType = Player::getPlayerGamePrivilege(player->getAllPlayerGamePrivileges(),Player::ePlayerGamePrivilege_CreativeMode) ? GameType::CREATIVE : GameType::SURVIVAL;
|
||
gameType = LevelSettings::validateGameType(gameType->getId());
|
||
if (player->gameMode->getGameModeForPlayer() != gameType)
|
||
{
|
||
player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_CreativeMode,player->gameMode->getGameModeForPlayer()->getId() );
|
||
}
|
||
|
||
//shared_ptr<PlayerConnection> playerConnection = shared_ptr<PlayerConnection>(new PlayerConnection(server, connection, player));
|
||
player->connection = playerConnection; // Used to be assigned in PlayerConnection ctor but moved out so we can use shared_ptr
|
||
|
||
// 4J Added to store UGC settings
|
||
playerConnection->m_friendsOnlyUGC = packet->m_friendsOnlyUGC;
|
||
playerConnection->m_offlineXUID = packet->m_offlineXuid;
|
||
playerConnection->m_onlineXUID = packet->m_onlineXuid;
|
||
|
||
// This player is now added to the list, so incrementing this value invalidates all previous PreLogin packets
|
||
if(packet->m_friendsOnlyUGC) ++server->m_ugcPlayersVersion;
|
||
|
||
addPlayerToReceiving( player );
|
||
|
||
int maxPlayersForPacket = getMaxPlayers() > 255 ? 255 : getMaxPlayers();
|
||
|
||
BYTE newSmallId = 0;
|
||
Socket *sock = connection->getSocket();
|
||
INetworkPlayer *np = sock ? sock->getPlayer() : nullptr;
|
||
if (np) newSmallId = np->GetSmallId();
|
||
app.DebugPrintf("RECONNECT: placeNewPlayer smallId=%d entityId=%d dim=%d\n",
|
||
newSmallId, player->entityId, level->dimension->id);
|
||
|
||
playerConnection->send( shared_ptr<LoginPacket>( new LoginPacket(L"", player->entityId, level->getLevelData()->getGenerator(), level->getSeed(), player->gameMode->getGameModeForPlayer()->getId(),
|
||
(byte) level->dimension->id, (byte) level->getMaxBuildHeight(), (byte) maxPlayersForPacket,
|
||
level->difficulty, TelemetryManager->GetMultiplayerInstanceID(), (BYTE)playerIndex, level->useNewSeaLevel(), player->getAllPlayerGamePrivileges(),
|
||
level->getLevelData()->getXZSize(), level->getLevelData()->getHellScale() ) ) );
|
||
playerConnection->send( shared_ptr<SetSpawnPositionPacket>( new SetSpawnPositionPacket(spawnPos->x, spawnPos->y, spawnPos->z) ) );
|
||
playerConnection->send( shared_ptr<PlayerAbilitiesPacket>( new PlayerAbilitiesPacket(&player->abilities)) );
|
||
playerConnection->send( shared_ptr<SetCarriedItemPacket>( new SetCarriedItemPacket(player->inventory->selected)));
|
||
delete spawnPos;
|
||
|
||
updateEntireScoreboard((ServerScoreboard *) level->getScoreboard(), player);
|
||
|
||
sendLevelInfo(player, level);
|
||
|
||
// 4J-PB - removed, since it needs to be localised in the language the client is in
|
||
//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"<22>e" + playerEntity->name + L" joined the game.") ) );
|
||
broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerJoinedGame) ) );
|
||
|
||
MemSect(14);
|
||
add(player);
|
||
MemSect(0);
|
||
|
||
player->doTick(true, true, false); // 4J - added - force sending of the nearest chunk before the player is teleported, so we have somewhere to arrive on...
|
||
playerConnection->teleport(player->x, player->y, player->z, player->yRot, player->xRot);
|
||
|
||
server->getConnection()->addPlayerConnection(playerConnection);
|
||
playerConnection->send( shared_ptr<SetTimePacket>( new SetTimePacket(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)) ) );
|
||
|
||
auto activeEffects = player->getActiveEffects();
|
||
for(MobEffectInstance *effect : *player->getActiveEffects())
|
||
{
|
||
playerConnection->send(shared_ptr<UpdateMobEffectPacket>( new UpdateMobEffectPacket(player->entityId, effect) ) );
|
||
}
|
||
|
||
player->initMenu();
|
||
|
||
if (playerTag != NULL && playerTag->contains(Entity::RIDING_TAG))
|
||
{
|
||
// this player has been saved with a mount tag
|
||
shared_ptr<Entity> mount = EntityIO::loadStatic(playerTag->getCompound(Entity::RIDING_TAG), level);
|
||
if (mount != NULL)
|
||
{
|
||
mount->forcedLoading = true;
|
||
level->addEntity(mount);
|
||
player->ride(mount);
|
||
mount->forcedLoading = false;
|
||
}
|
||
}
|
||
|
||
// If we are joining at the same time as someone in the end on this system is travelling through the win portal,
|
||
// then we should set our wonGame flag to true so that respawning works when the EndPoem is closed
|
||
INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
|
||
if( thisPlayer )
|
||
{
|
||
for(auto& servPlayer : players)
|
||
{
|
||
INetworkPlayer* checkPlayer = servPlayer->connection->getNetworkPlayer();
|
||
if(thisPlayer != checkPlayer && checkPlayer && thisPlayer->IsSameSystem( checkPlayer ) && servPlayer->wonGame )
|
||
{
|
||
player->wonGame = true;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
return true;
|
||
}
|
||
|
||
void PlayerList::updateEntireScoreboard(ServerScoreboard *scoreboard, shared_ptr<ServerPlayer> player)
|
||
{
|
||
//unordered_set<Objective *> objectives;
|
||
|
||
//for (PlayerTeam team : scoreboard->getPlayerTeams())
|
||
//{
|
||
// player->connection->send( shared_ptr<SetPlayerTeamPacket>(new SetPlayerTeamPacket(team, SetPlayerTeamPacket::METHOD_ADD)));
|
||
//}
|
||
|
||
//for (int slot = 0; slot < Scoreboard::DISPLAY_SLOTS; slot++)
|
||
//{
|
||
// Objective objective = scoreboard->getDisplayObjective(slot);
|
||
|
||
// if (objective != NULL && !objectives->contains(objective))
|
||
// {
|
||
// vector<shared_ptr<Packet> > *packets = scoreboard->getStartTrackingPackets(objective);
|
||
|
||
// for (Packet packet : packets)
|
||
// {
|
||
// player->connection->send(packet);
|
||
// }
|
||
|
||
// objectives->add(objective);
|
||
// }
|
||
//}
|
||
}
|
||
|
||
void PlayerList::setLevel(ServerLevelArray levels)
|
||
{
|
||
playerIo = levels[0]->getLevelStorage()->getPlayerIO();
|
||
}
|
||
|
||
void PlayerList::changeDimension(shared_ptr<ServerPlayer> player, ServerLevel *from)
|
||
{
|
||
ServerLevel *to = player->getLevel();
|
||
|
||
if (from != NULL) from->getChunkMap()->remove(player);
|
||
to->getChunkMap()->add(player);
|
||
|
||
to->cache->create(((int) player->x) >> 4, ((int) player->z) >> 4);
|
||
}
|
||
|
||
int PlayerList::getMaxRange()
|
||
{
|
||
return PlayerChunkMap::convertChunkRangeToBlock(getViewDistance());
|
||
}
|
||
|
||
CompoundTag *PlayerList::load(shared_ptr<ServerPlayer> player)
|
||
{
|
||
return playerIo->load(player);
|
||
}
|
||
|
||
void PlayerList::save(shared_ptr<ServerPlayer> player)
|
||
{
|
||
playerIo->save(player);
|
||
}
|
||
|
||
// 4J Stu - TU-1 hotifx
|
||
// Add this function to take some of the code from the PlayerList::add function with the fixes
|
||
// for checking spawn area, especially in the nether. These needed to be done in a different order from before
|
||
// Fix for #13150 - When a player loads/joins a game after saving/leaving in the nether, sometimes they are spawned on top of the nether and cannot mine down
|
||
void PlayerList::validatePlayerSpawnPosition(shared_ptr<ServerPlayer> player)
|
||
{
|
||
// 4J Stu - Some adjustments to make sure the current players position is correct
|
||
// Make sure that the player is on the ground, and in the centre x/z of the current column
|
||
app.DebugPrintf("Original pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);
|
||
|
||
bool spawnForced = player->isRespawnForced();
|
||
|
||
double targetX = 0;
|
||
if(player->x < 0) targetX = Mth::ceil(player->x) - 0.5;
|
||
else targetX = Mth::floor(player->x) + 0.5;
|
||
|
||
double targetY = floor(player->y);
|
||
|
||
double targetZ = 0;
|
||
if(player->z < 0) targetZ = Mth::ceil(player->z) - 0.5;
|
||
else targetZ = Mth::floor(player->z) + 0.5;
|
||
|
||
player->setPos(targetX, targetY, targetZ);
|
||
|
||
app.DebugPrintf("New pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);
|
||
|
||
ServerLevel *level = server->getLevel(player->dimension);
|
||
while (level->getCubes(player, player->bb)->size() != 0)
|
||
{
|
||
player->setPos(player->x, player->y + 1, player->z);
|
||
}
|
||
app.DebugPrintf("Final pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);
|
||
|
||
// 4J Stu - If we are in the nether and the above while loop has put us above the nether then we have a problem
|
||
// Finding a valid, safe spawn point is potentially computationally expensive (may have to hunt through a large part
|
||
// of the nether) so move the player to their spawn position in the overworld so that they do not lose their inventory
|
||
// 4J Stu - We also use this mechanism to force a spawn point in the overworld for players who were in the save when the reset nether option was applied
|
||
if(level->dimension->id == -1 && player->y > 125)
|
||
{
|
||
app.DebugPrintf("Player in the nether tried to spawn at y = %f, moving to overworld\n", player->y);
|
||
player->setLevel(server->getLevel(0));
|
||
player->gameMode->setLevel(server->getLevel(0));
|
||
player->dimension = 0;
|
||
|
||
level = server->getLevel(player->dimension);
|
||
|
||
Pos *levelSpawn = level->getSharedSpawnPos();
|
||
player->setPos(levelSpawn->x, levelSpawn->y, levelSpawn->z);
|
||
delete levelSpawn;
|
||
|
||
Pos *bedPosition = player->getRespawnPosition();
|
||
if (bedPosition != NULL)
|
||
{
|
||
Pos *respawnPosition = Player::checkBedValidRespawnPosition(server->getLevel(player->dimension), bedPosition, spawnForced);
|
||
if (respawnPosition != NULL)
|
||
{
|
||
player->moveTo(respawnPosition->x + 0.5f, respawnPosition->y + 0.1f, respawnPosition->z + 0.5f, 0, 0);
|
||
player->setRespawnPosition(bedPosition, spawnForced);
|
||
}
|
||
delete bedPosition;
|
||
}
|
||
while (level->getCubes(player, player->bb)->size() != 0)
|
||
{
|
||
player->setPos(player->x, player->y + 1, player->z);
|
||
}
|
||
|
||
app.DebugPrintf("Updated pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);
|
||
}
|
||
}
|
||
|
||
void PlayerList::add(shared_ptr<ServerPlayer> player)
|
||
{
|
||
//broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(player->name, true, 1000) ) );
|
||
if( player->connection->getNetworkPlayer() )
|
||
{
|
||
broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player ) ) );
|
||
}
|
||
|
||
players.push_back(player);
|
||
|
||
// 4J Added
|
||
addPlayerToReceiving(player);
|
||
|
||
// Ensure the area the player is spawning in is loaded!
|
||
ServerLevel *level = server->getLevel(player->dimension);
|
||
|
||
// 4J Stu - TU-1 hotfix
|
||
// Fix for #13150 - When a player loads/joins a game after saving/leaving in the nether, sometimes they are spawned on top of the nether and cannot mine down
|
||
// Some code from here has been moved to the above validatePlayerSpawnPosition function
|
||
|
||
// 4J Stu - Swapped these lines about so that we get the chunk visiblity packet way ahead of all the add tracked entity packets
|
||
// Fix for #9169 - ART : Sign text is replaced with the words <20>Awaiting approval<61>.
|
||
changeDimension(player, NULL);
|
||
level->addEntity(player);
|
||
|
||
for (int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> op = players.at(i);
|
||
//player->connection->send(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(op->name, true, op->latency) ) );
|
||
if( op->connection->getNetworkPlayer() )
|
||
{
|
||
player->connection->send(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( op ) ) );
|
||
}
|
||
}
|
||
|
||
if(level->isAtLeastOnePlayerSleeping())
|
||
{
|
||
shared_ptr<ServerPlayer> firstSleepingPlayer = nullptr;
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> thisPlayer = players[i];
|
||
if(thisPlayer->isSleeping())
|
||
{
|
||
if(firstSleepingPlayer == NULL) firstSleepingPlayer = thisPlayer;
|
||
thisPlayer->connection->send(shared_ptr<ChatPacket>( new ChatPacket(thisPlayer->name, ChatPacket::e_ChatBedMeSleep)));
|
||
}
|
||
}
|
||
player->connection->send(shared_ptr<ChatPacket>( new ChatPacket(firstSleepingPlayer->name, ChatPacket::e_ChatBedPlayerSleep)));
|
||
}
|
||
}
|
||
|
||
void PlayerList::move(shared_ptr<ServerPlayer> player)
|
||
{
|
||
player->getLevel()->getChunkMap()->move(player);
|
||
}
|
||
|
||
void PlayerList::remove(shared_ptr<ServerPlayer> player)
|
||
{
|
||
save(player);
|
||
//4J Stu - We don't want to save the map data for guests, so when we are sure that the player is gone delete the map
|
||
if(player->isGuest()) playerIo->deleteMapFilesForPlayer(player);
|
||
ServerLevel *level = player->getLevel();
|
||
if (player->riding != NULL)
|
||
{
|
||
level->removeEntityImmediately(player->riding);
|
||
app.DebugPrintf("removing player mount");
|
||
}
|
||
level->getTracker()->removeEntity(player);
|
||
level->removeEntity(player);
|
||
level->getChunkMap()->remove(player);
|
||
auto it = find(players.begin(), players.end(), player);
|
||
if( it != players.end() )
|
||
{
|
||
players.erase(it);
|
||
}
|
||
//broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(player->name, false, 9999) ) );
|
||
|
||
removePlayerFromReceiving(player);
|
||
player->connection = nullptr; // Must remove reference to connection, or else there is a circular dependency
|
||
delete player->gameMode; // Gamemode also needs deleted as it references back to this player
|
||
player->gameMode = NULL;
|
||
|
||
// 4J Stu - Save all the players currently in the game, which will also free up unused map id slots if required, and remove old players
|
||
saveAll(NULL,false);
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> PlayerList::getPlayerForLogin(PendingConnection *pendingConnection, const wstring& userName, PlayerUID xuid, PlayerUID onlineXuid)
|
||
{
|
||
if (players.size() >= (unsigned int)maxPlayers)
|
||
{
|
||
pendingConnection->disconnect(DisconnectPacket::eDisconnect_ServerFull);
|
||
return shared_ptr<ServerPlayer>();
|
||
}
|
||
shared_ptr<ServerPlayer> player = shared_ptr<ServerPlayer>(new ServerPlayer(server, server->getLevel(0), userName, new ServerPlayerGameMode(server->getLevel(0)) ));
|
||
player->gameMode->player = player; // 4J added as had to remove this assignment from ServerPlayer ctor
|
||
player->setXuid( xuid ); // 4J Added
|
||
player->setOnlineXuid( onlineXuid ); // 4J Added
|
||
#ifdef _WINDOWS64
|
||
{
|
||
// Use packet-supplied identity from LoginPacket.
|
||
// Do not recompute from name here: mixed-version clients must stay compatible.
|
||
INetworkPlayer* np = pendingConnection->connection->getSocket()->getPlayer();
|
||
if (np != NULL)
|
||
{
|
||
player->setOnlineXuid(np->GetUID());
|
||
|
||
// Backward compatibility: when Minecraft.Client is hosting, keep the first
|
||
// host player on the legacy embedded host XUID (base + 0).
|
||
// This preserves pre-migration host playerdata in existing worlds.
|
||
if (np->IsHost())
|
||
{
|
||
player->setXuid(Win64Xuid::GetLegacyEmbeddedHostXuid());
|
||
}
|
||
}
|
||
}
|
||
#endif
|
||
// Work out the base server player settings
|
||
INetworkPlayer *networkPlayer = pendingConnection->connection->getSocket()->getPlayer();
|
||
if(networkPlayer != NULL && !networkPlayer->IsHost())
|
||
{
|
||
player->enableAllPlayerPrivileges( app.GetGameHostOption(eGameHostOption_TrustPlayers)>0 );
|
||
}
|
||
|
||
// 4J Added
|
||
LevelRuleset *serverRuleDefs = app.getGameRuleDefinitions();
|
||
if(serverRuleDefs != NULL)
|
||
{
|
||
player->gameMode->setGameRules( GameRuleDefinition::generateNewGameRulesInstance(GameRulesInstance::eGameRulesInstanceType_ServerPlayer, serverRuleDefs, pendingConnection->connection) );
|
||
}
|
||
|
||
return player;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> PlayerList::respawn(shared_ptr<ServerPlayer> serverPlayer, int targetDimension, bool keepAllPlayerData)
|
||
{
|
||
// How we handle the entity tracker depends on whether we are the primary player currently, and whether there will be any player in the same system in the same dimension once we finish respawning.
|
||
bool isPrimary = canReceiveAllPackets(serverPlayer); // Is this the primary player in its current dimension?
|
||
int oldDimension = serverPlayer->dimension;
|
||
bool isEmptying = ( targetDimension != oldDimension); // We're not emptying this dimension on this machine if this player is going back into the same dimension
|
||
|
||
// Also consider if there is another player on this machine which is in the same dimension and can take over as primary player
|
||
if( isEmptying )
|
||
{
|
||
INetworkPlayer *thisPlayer = serverPlayer->connection->getNetworkPlayer();
|
||
|
||
for( unsigned int i = 0; i < players.size(); i++ )
|
||
{
|
||
shared_ptr<ServerPlayer> ep = players[i];
|
||
if( ep == serverPlayer ) continue;
|
||
if( ep->dimension != oldDimension ) continue;
|
||
|
||
INetworkPlayer * otherPlayer = ep->connection->getNetworkPlayer();
|
||
if( otherPlayer != NULL && thisPlayer->IsSameSystem(otherPlayer) )
|
||
{
|
||
// There's another player here in the same dimension - we're not the last one out
|
||
isEmptying = false;
|
||
}
|
||
}
|
||
}
|
||
|
||
// Now we know where we stand, the actions to take are as follows:
|
||
// (1) if this isn't the primary player, then we just need to remove it from the entity tracker
|
||
// (2) if this Is the primary player then:
|
||
// (a) if isEmptying is true, then remove the player from the tracker, and send "remove entity" packets for anything seen (this is the original behaviour of the code)
|
||
// (b) if isEmptying is false, then we'll be transferring control of entity tracking to another player
|
||
|
||
if( isPrimary )
|
||
{
|
||
if( isEmptying )
|
||
{
|
||
app.DebugPrintf("Emptying this dimension\n");
|
||
serverPlayer->getLevel()->getTracker()->clear(serverPlayer);
|
||
}
|
||
else
|
||
{
|
||
app.DebugPrintf("Transferring... storing flags\n");
|
||
serverPlayer->getLevel()->getTracker()->removeEntity(serverPlayer);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
app.DebugPrintf("Not primary player\n");
|
||
serverPlayer->getLevel()->getTracker()->removeEntity(serverPlayer);
|
||
}
|
||
|
||
serverPlayer->getLevel()->getChunkMap()->remove(serverPlayer);
|
||
auto it = find(players.begin(), players.end(), serverPlayer);
|
||
if( it != players.end() )
|
||
{
|
||
players.erase(it);
|
||
}
|
||
server->getLevel(serverPlayer->dimension)->removeEntityImmediately(serverPlayer);
|
||
|
||
Pos *bedPosition = serverPlayer->getRespawnPosition();
|
||
bool spawnForced = serverPlayer->isRespawnForced();
|
||
|
||
removePlayerFromReceiving(serverPlayer);
|
||
serverPlayer->dimension = targetDimension;
|
||
|
||
EDefaultSkins skin = serverPlayer->getPlayerDefaultSkin();
|
||
DWORD playerIndex = serverPlayer->getPlayerIndex();
|
||
|
||
PlayerUID playerXuid = serverPlayer->getXuid();
|
||
PlayerUID playerOnlineXuid = serverPlayer->getOnlineXuid();
|
||
|
||
shared_ptr<ServerPlayer> player = shared_ptr<ServerPlayer>(new ServerPlayer(server, server->getLevel(serverPlayer->dimension), serverPlayer->getName(), new ServerPlayerGameMode(server->getLevel(serverPlayer->dimension))));
|
||
player->connection = serverPlayer->connection;
|
||
player->restoreFrom(serverPlayer, keepAllPlayerData);
|
||
if (keepAllPlayerData)
|
||
{
|
||
// Fix for #81759 - TU9: Content: Gameplay: Entering The End Exit Portal replaces the Player's currently held item with the first one from the Quickbar
|
||
player->inventory->selected = serverPlayer->inventory->selected;
|
||
}
|
||
player->gameMode->player = player; // 4J added as had to remove this assignment from ServerPlayer ctor
|
||
player->setXuid( playerXuid ); // 4J Added
|
||
player->setOnlineXuid( playerOnlineXuid ); // 4J Added
|
||
|
||
// 4J Stu - Don't reuse the id. If we do, then the player can be re-added after being removed, but the add packet gets sent before the remove packet
|
||
//player->entityId = serverPlayer->entityId;
|
||
|
||
player->setPlayerDefaultSkin( skin );
|
||
player->setIsGuest( serverPlayer->isGuest() );
|
||
player->setPlayerIndex( playerIndex );
|
||
player->setCustomSkin( serverPlayer->getCustomSkin() );
|
||
player->setCustomCape( serverPlayer->getCustomCape() );
|
||
player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_All, serverPlayer->getAllPlayerGamePrivileges());
|
||
player->gameMode->setGameRules( serverPlayer->gameMode->getGameRules() );
|
||
player->dimension = targetDimension;
|
||
|
||
// 4J Stu - Added this as we need to know earlier if the player is the player for this connection so that
|
||
// we can work out if they are the primary for the system and can receive all packets
|
||
player->connection->setPlayer( player );
|
||
|
||
addPlayerToReceiving(player);
|
||
|
||
ServerLevel *level = server->getLevel(serverPlayer->dimension);
|
||
|
||
// reset the player's game mode (first pick from old, then copy level if
|
||
// necessary)
|
||
updatePlayerGameMode(player, serverPlayer, level);
|
||
|
||
if(serverPlayer->wonGame && targetDimension == oldDimension && serverPlayer->getHealth() > 0)
|
||
{
|
||
// If the player is still alive and respawning to the same dimension, they are just being added back from someone else viewing the Win screen
|
||
player->moveTo(serverPlayer->x, serverPlayer->y, serverPlayer->z, serverPlayer->yRot, serverPlayer->xRot);
|
||
if(bedPosition != NULL)
|
||
{
|
||
player->setRespawnPosition(bedPosition, spawnForced);
|
||
delete bedPosition;
|
||
}
|
||
// Fix for #81759 - TU9: Content: Gameplay: Entering The End Exit Portal replaces the Player's currently held item with the first one from the Quickbar
|
||
player->inventory->selected = serverPlayer->inventory->selected;
|
||
}
|
||
else if (bedPosition != NULL)
|
||
{
|
||
Pos *respawnPosition = Player::checkBedValidRespawnPosition(server->getLevel(serverPlayer->dimension), bedPosition, spawnForced);
|
||
if (respawnPosition != NULL)
|
||
{
|
||
player->moveTo(respawnPosition->x + 0.5f, respawnPosition->y + 0.1f, respawnPosition->z + 0.5f, 0, 0);
|
||
player->setRespawnPosition(bedPosition, spawnForced);
|
||
}
|
||
else
|
||
{
|
||
player->connection->send( shared_ptr<GameEventPacket>( new GameEventPacket(GameEventPacket::NO_RESPAWN_BED_AVAILABLE, 0) ) );
|
||
}
|
||
delete bedPosition;
|
||
}
|
||
|
||
// Ensure the area the player is spawning in is loaded!
|
||
level->cache->create(((int) player->x) >> 4, ((int) player->z) >> 4);
|
||
|
||
while (!level->getCubes(player, player->bb)->empty())
|
||
{
|
||
player->setPos(player->x, player->y + 1, player->z);
|
||
}
|
||
|
||
player->connection->send( std::make_shared<RespawnPacket>( (char) player->dimension, player->level->getSeed(), player->level->getMaxBuildHeight(),
|
||
player->gameMode->getGameModeForPlayer(), level->difficulty, level->getLevelData()->getGenerator(),
|
||
player->level->useNewSeaLevel(), player->entityId, level->getLevelData()->getXZSize(), level->getLevelData()->getHellScale() ) );
|
||
player->connection->teleport(player->x, player->y, player->z, player->yRot, player->xRot);
|
||
player->connection->send( std::make_shared<SetExperiencePacket>( player->experienceProgress, player->totalExperience, player->experienceLevel) );
|
||
|
||
if(keepAllPlayerData)
|
||
{
|
||
vector<MobEffectInstance *> *activeEffects = player->getActiveEffects();
|
||
for(MobEffectInstance *effect : *activeEffects)
|
||
{
|
||
player->connection->send(std::make_shared<UpdateMobEffectPacket>( player->entityId, effect ) );
|
||
}
|
||
delete activeEffects;
|
||
player->getEntityData()->markDirty(Mob::DATA_EFFECT_COLOR_ID);
|
||
}
|
||
|
||
sendLevelInfo(player, level);
|
||
|
||
level->getChunkMap()->add(player);
|
||
level->addEntity(player);
|
||
players.push_back(player);
|
||
|
||
player->initMenu();
|
||
player->setHealth(player->getHealth());
|
||
|
||
// 4J-JEV - Dying before this point in the tutorial is pretty annoying,
|
||
// making sure to remove health/hunger and give you back your meat.
|
||
if( Minecraft::GetInstance()->isTutorial()
|
||
&& (!Minecraft::GetInstance()->gameMode->getTutorial()->isStateCompleted(e_Tutorial_State_Food_Bar)) )
|
||
{
|
||
app.getGameRuleDefinitions()->postProcessPlayer(player);
|
||
}
|
||
|
||
if( oldDimension == 1 && player->dimension != 1 )
|
||
{
|
||
player->displayClientMessage(IDS_PLAYER_LEFT_END);
|
||
}
|
||
|
||
return player;
|
||
|
||
}
|
||
|
||
void PlayerList::toggleDimension(shared_ptr<ServerPlayer> player, int targetDimension)
|
||
{
|
||
int lastDimension = player->dimension;
|
||
// How we handle the entity tracker depends on whether we are the primary player currently, and whether there will be any player in the same system in the same dimension once we finish respawning.
|
||
bool isPrimary = canReceiveAllPackets(player); // Is this the primary player in its current dimension?
|
||
bool isEmptying = true;
|
||
|
||
// Also consider if there is another player on this machine which is in the same dimension and can take over as primary player
|
||
INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
|
||
|
||
for( unsigned int i = 0; i < players.size(); i++ )
|
||
{
|
||
shared_ptr<ServerPlayer> ep = players[i];
|
||
if( ep == player ) continue;
|
||
if( ep->dimension != lastDimension ) continue;
|
||
|
||
INetworkPlayer * otherPlayer = ep->connection->getNetworkPlayer();
|
||
if( otherPlayer != NULL && thisPlayer->IsSameSystem(otherPlayer) )
|
||
{
|
||
// There's another player here in the same dimension - we're not the last one out
|
||
isEmptying = false;
|
||
}
|
||
}
|
||
|
||
|
||
// Now we know where we stand, the actions to take are as follows:
|
||
// (1) if this isn't the primary player, then we just need to remove it from the entity tracker
|
||
// (2) if this Is the primary player then:
|
||
// (a) if isEmptying is true, then remove the player from the tracker, and send "remove entity" packets for anything seen (this is the original behaviour of the code)
|
||
// (b) if isEmptying is false, then we'll be transferring control of entity tracking to another player
|
||
|
||
if( isPrimary )
|
||
{
|
||
if( isEmptying )
|
||
{
|
||
app.DebugPrintf("Toggle... Emptying this dimension\n");
|
||
player->getLevel()->getTracker()->clear(player);
|
||
}
|
||
else
|
||
{
|
||
app.DebugPrintf("Toggle... transferring\n");
|
||
player->getLevel()->getTracker()->removeEntity(player);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
app.DebugPrintf("Toggle... Not primary player\n");
|
||
player->getLevel()->getTracker()->removeEntity(player);
|
||
}
|
||
|
||
ServerLevel *oldLevel = server->getLevel(player->dimension);
|
||
|
||
// 4J Stu - Do this much earlier so we don't end up unloading chunks in the wrong dimension
|
||
player->getLevel()->getChunkMap()->remove(player);
|
||
|
||
if(player->dimension != 1 && targetDimension == 1)
|
||
{
|
||
player->displayClientMessage(IDS_PLAYER_ENTERED_END);
|
||
}
|
||
else if( player->dimension == 1 )
|
||
{
|
||
player->displayClientMessage(IDS_PLAYER_LEFT_END);
|
||
}
|
||
|
||
player->dimension = targetDimension;
|
||
|
||
ServerLevel *newLevel = server->getLevel(player->dimension);
|
||
|
||
// 4J Stu - Fix for #46423 - TU5: Art: Code: No burning animation visible after entering The Nether while burning
|
||
player->clearFire(); // Stop burning if travelling through a portal
|
||
|
||
// 4J Stu Added so that we remove entities from the correct level, after the respawn packet we will be in the wrong level
|
||
player->flushEntitiesToRemove();
|
||
|
||
player->connection->send( shared_ptr<RespawnPacket>( new RespawnPacket((char) player->dimension, newLevel->getSeed(), newLevel->getMaxBuildHeight(),
|
||
player->gameMode->getGameModeForPlayer(), newLevel->difficulty, newLevel->getLevelData()->getGenerator(),
|
||
newLevel->useNewSeaLevel(), player->entityId, newLevel->getLevelData()->getXZSize(), newLevel->getLevelData()->getHellScale()) ) );
|
||
|
||
oldLevel->removeEntityImmediately(player);
|
||
player->removed = false;
|
||
|
||
repositionAcrossDimension(player, lastDimension, oldLevel, newLevel);
|
||
changeDimension(player, oldLevel);
|
||
|
||
player->gameMode->setLevel(newLevel);
|
||
|
||
// Resend the teleport if we haven't yet sent the chunk they will land on
|
||
if( !g_NetworkManager.SystemFlagGet(player->connection->getNetworkPlayer(),ServerPlayer::getFlagIndexForChunk( ChunkPos(player->xChunk,player->zChunk), player->level->dimension->id ) ) )
|
||
{
|
||
player->connection->teleport(player->x, player->y, player->z, player->yRot, player->xRot, false);
|
||
// Force sending of the current chunk
|
||
player->doTick(true, true, true);
|
||
}
|
||
|
||
player->connection->teleport(player->x, player->y, player->z, player->yRot, player->xRot);
|
||
|
||
// 4J Stu - Fix for #64683 - Customer Encountered: TU7: Content: Gameplay: Potion effects are removed after using the Nether Portal
|
||
vector<MobEffectInstance *> *activeEffects = player->getActiveEffects();
|
||
for(MobEffectInstance *effect : *activeEffects)
|
||
{
|
||
player->connection->send(std::make_shared<UpdateMobEffectPacket>( player->entityId, effect ) );
|
||
}
|
||
delete activeEffects;
|
||
player->getEntityData()->markDirty(Mob::DATA_EFFECT_COLOR_ID);
|
||
|
||
sendLevelInfo(player, newLevel);
|
||
sendAllPlayerInfo(player);
|
||
}
|
||
|
||
void PlayerList::repositionAcrossDimension(shared_ptr<Entity> entity, int lastDimension, ServerLevel *oldLevel, ServerLevel *newLevel)
|
||
{
|
||
double xt = entity->x;
|
||
double zt = entity->z;
|
||
double xOriginal = entity->x;
|
||
double yOriginal = entity->y;
|
||
double zOriginal = entity->z;
|
||
float yRotOriginal = entity->yRot;
|
||
double scale = newLevel->getLevelData()->getHellScale(); // 4J Scale was 8 but this is all we can fit in
|
||
if (entity->dimension == -1)
|
||
{
|
||
xt /= scale;
|
||
zt /= scale;
|
||
entity->moveTo(xt, entity->y, zt, entity->yRot, entity->xRot);
|
||
if (entity->isAlive())
|
||
{
|
||
oldLevel->tick(entity, false);
|
||
}
|
||
}
|
||
else if (entity->dimension == 0)
|
||
{
|
||
xt *= scale;
|
||
zt *= scale;
|
||
entity->moveTo(xt, entity->y, zt, entity->yRot, entity->xRot);
|
||
if (entity->isAlive())
|
||
{
|
||
oldLevel->tick(entity, false);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
Pos *p;
|
||
|
||
if (lastDimension == 1)
|
||
{
|
||
// Coming from the end
|
||
p = newLevel->getSharedSpawnPos();
|
||
}
|
||
else
|
||
{
|
||
// Going to the end
|
||
p = newLevel->getDimensionSpecificSpawn();
|
||
}
|
||
|
||
xt = p->x;
|
||
entity->y = p->y;
|
||
zt = p->z;
|
||
delete p;
|
||
entity->moveTo(xt, entity->y, zt, 90, 0);
|
||
if (entity->isAlive())
|
||
{
|
||
oldLevel->tick(entity, false);
|
||
}
|
||
}
|
||
|
||
if(entity->GetType() == eTYPE_SERVERPLAYER)
|
||
{
|
||
shared_ptr<ServerPlayer> player = dynamic_pointer_cast<ServerPlayer>(entity);
|
||
removePlayerFromReceiving(player, false, lastDimension);
|
||
addPlayerToReceiving(player);
|
||
}
|
||
|
||
if (lastDimension != 1)
|
||
{
|
||
xt = (double) Mth::clamp((int) xt, -Level::MAX_LEVEL_SIZE + 128, Level::MAX_LEVEL_SIZE - 128);
|
||
zt = (double) Mth::clamp((int) zt, -Level::MAX_LEVEL_SIZE + 128, Level::MAX_LEVEL_SIZE - 128);
|
||
if (entity->isAlive())
|
||
{
|
||
newLevel->addEntity(entity);
|
||
entity->moveTo(xt, entity->y, zt, entity->yRot, entity->xRot);
|
||
newLevel->tick(entity, false);
|
||
newLevel->cache->autoCreate = true;
|
||
newLevel->getPortalForcer()->force(entity, xOriginal, yOriginal, zOriginal, yRotOriginal);
|
||
newLevel->cache->autoCreate = false;
|
||
}
|
||
}
|
||
|
||
entity->setLevel(newLevel);
|
||
}
|
||
|
||
void PlayerList::tick()
|
||
{
|
||
// 4J - brought changes to how often this is sent forward from 1.2.3
|
||
if (++sendAllPlayerInfoIn > SEND_PLAYER_INFO_INTERVAL)
|
||
{
|
||
sendAllPlayerInfoIn = 0;
|
||
}
|
||
|
||
if (sendAllPlayerInfoIn < players.size())
|
||
{
|
||
shared_ptr<ServerPlayer> op = players[sendAllPlayerInfoIn];
|
||
//broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(op->name, true, op->latency) ) );
|
||
if( op->connection->getNetworkPlayer() )
|
||
{
|
||
broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( op ) ) );
|
||
}
|
||
}
|
||
|
||
EnterCriticalSection(&m_closePlayersCS);
|
||
while(!m_smallIdsToClose.empty())
|
||
{
|
||
BYTE smallId = m_smallIdsToClose.front();
|
||
m_smallIdsToClose.pop_front();
|
||
|
||
shared_ptr<ServerPlayer> player = nullptr;
|
||
|
||
for(unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> p = players.at(i);
|
||
// 4J Stu - May be being a bit overprotective with all the NULL checks, but adding late in TU7 so want to be safe
|
||
if (p != NULL && p->connection != NULL && p->connection->connection != NULL && p->connection->connection->getSocket() != NULL && p->connection->connection->getSocket()->getSmallId() == smallId )
|
||
{
|
||
player = p;
|
||
break;
|
||
}
|
||
}
|
||
|
||
if (player != NULL)
|
||
{
|
||
player->connection->disconnect( DisconnectPacket::eDisconnect_Closed );
|
||
}
|
||
|
||
#ifdef _WINDOWS64
|
||
// The old Connection's read/write threads are now dead (disconnect waits
|
||
// for them). Safe to recycle the smallId — no stale write thread can
|
||
// resolve getPlayer() to a new connection that reuses this slot.
|
||
WinsockNetLayer::PushFreeSmallId(smallId);
|
||
WinsockNetLayer::ClearSocketForSmallId(smallId);
|
||
#endif
|
||
}
|
||
LeaveCriticalSection(&m_closePlayersCS);
|
||
|
||
EnterCriticalSection(&m_kickPlayersCS);
|
||
while(!m_smallIdsToKick.empty())
|
||
{
|
||
BYTE smallId = m_smallIdsToKick.front();
|
||
m_smallIdsToKick.pop_front();
|
||
INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId(smallId);
|
||
if( selectedPlayer != NULL )
|
||
{
|
||
if( selectedPlayer->IsLocal() != TRUE )
|
||
{
|
||
//#ifdef _XBOX
|
||
PlayerUID xuid = selectedPlayer->GetUID();
|
||
// Kick this player from the game
|
||
shared_ptr<ServerPlayer> player = nullptr;
|
||
|
||
for(unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> p = players.at(i);
|
||
PlayerUID playersXuid = p->getOnlineXuid();
|
||
if (p != NULL && ProfileManager.AreXUIDSEqual(playersXuid, xuid ) )
|
||
{
|
||
player = p;
|
||
break;
|
||
}
|
||
}
|
||
|
||
if (player != NULL)
|
||
{
|
||
m_bannedXuids.push_back( player->getOnlineXuid() );
|
||
// 4J Stu - If we have kicked a player, make sure that they have no privileges if they later try to join the world when trust players is off
|
||
player->enableAllPlayerPrivileges( false );
|
||
player->connection->setWasKicked();
|
||
player->connection->send( shared_ptr<DisconnectPacket>( new DisconnectPacket(DisconnectPacket::eDisconnect_Kicked) ));
|
||
}
|
||
//#endif
|
||
}
|
||
}
|
||
}
|
||
LeaveCriticalSection(&m_kickPlayersCS);
|
||
|
||
// Check our receiving players, and if they are dead see if we can replace them
|
||
for(unsigned int dim = 0; dim < 2; ++dim)
|
||
{
|
||
for(unsigned int i = 0; i < receiveAllPlayers[dim].size(); ++i)
|
||
{
|
||
shared_ptr<ServerPlayer> currentPlayer = receiveAllPlayers[dim][i];
|
||
if(currentPlayer->removed)
|
||
{
|
||
shared_ptr<ServerPlayer> newPlayer = findAlivePlayerOnSystem(currentPlayer);
|
||
if(newPlayer != NULL)
|
||
{
|
||
receiveAllPlayers[dim][i] = newPlayer;
|
||
app.DebugPrintf("Replacing primary player %ls with %ls in dimension %d\n", currentPlayer->name.c_str(), newPlayer->name.c_str(), dim);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
bool PlayerList::isTrackingTile(int x, int y, int z, int dimension)
|
||
{
|
||
return server->getLevel(dimension)->getChunkMap()->isTrackingTile(x, y, z);
|
||
}
|
||
|
||
// 4J added - make sure that any tile updates for the chunk at this location get prioritised for sending
|
||
void PlayerList::prioritiseTileChanges(int x, int y, int z, int dimension)
|
||
{
|
||
server->getLevel(dimension)->getChunkMap()->prioritiseTileChanges(x, y, z);
|
||
}
|
||
|
||
void PlayerList::broadcastAll(shared_ptr<Packet> packet)
|
||
{
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> player = players[i];
|
||
player->connection->send(packet);
|
||
}
|
||
}
|
||
|
||
void PlayerList::broadcastAll(shared_ptr<Packet> packet, int dimension)
|
||
{
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> player = players[i];
|
||
if (player->dimension == dimension) player->connection->send(packet);
|
||
}
|
||
}
|
||
|
||
wstring PlayerList::getPlayerNames()
|
||
{
|
||
wstring msg;
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
if (i > 0) msg += L", ";
|
||
msg += players[i]->name;
|
||
}
|
||
return msg;
|
||
}
|
||
|
||
bool PlayerList::isWhiteListed(const wstring& name)
|
||
{
|
||
return true;
|
||
}
|
||
|
||
bool PlayerList::isOp(const wstring& name)
|
||
{
|
||
return false;
|
||
}
|
||
|
||
bool PlayerList::isOp(shared_ptr<ServerPlayer> player)
|
||
{
|
||
bool cheatsEnabled = app.GetGameHostOption(eGameHostOption_CheatsEnabled);
|
||
#ifdef _DEBUG_MENUS_ENABLED
|
||
cheatsEnabled = cheatsEnabled || app.GetUseDPadForDebug();
|
||
#endif
|
||
INetworkPlayer *networkPlayer = player->connection->getNetworkPlayer();
|
||
bool isOp = cheatsEnabled && (player->isModerator() || (networkPlayer != NULL && networkPlayer->IsHost()));
|
||
return isOp;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> PlayerList::getPlayer(const wstring& name)
|
||
{
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> p = players[i];
|
||
if (p->name == name) // 4J - used to be case insensitive (using equalsIgnoreCase) - imagine we'll be shifting to XUIDs anyway
|
||
{
|
||
return p;
|
||
}
|
||
}
|
||
return nullptr;
|
||
}
|
||
|
||
// 4J Added
|
||
shared_ptr<ServerPlayer> PlayerList::getPlayer(PlayerUID uid)
|
||
{
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> p = players[i];
|
||
if (p->getXuid() == uid || p->getOnlineXuid() == uid) // 4J - used to be case insensitive (using equalsIgnoreCase) - imagine we'll be shifting to XUIDs anyway
|
||
{
|
||
return p;
|
||
}
|
||
}
|
||
return nullptr;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> PlayerList::getNearestPlayer(Pos *position, int range)
|
||
{
|
||
if (players.empty()) return nullptr;
|
||
if (position == NULL) return players.at(0);
|
||
shared_ptr<ServerPlayer> current = nullptr;
|
||
double dist = -1;
|
||
int rangeSqr = range * range;
|
||
|
||
for (int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> next = players.at(i);
|
||
double newDist = position->distSqr(next->getCommandSenderWorldPosition());
|
||
|
||
if ((dist == -1 || newDist < dist) && (range <= 0 || newDist <= rangeSqr))
|
||
{
|
||
dist = newDist;
|
||
current = next;
|
||
}
|
||
}
|
||
|
||
return current;
|
||
}
|
||
|
||
vector<ServerPlayer> *PlayerList::getPlayers(Pos *position, int rangeMin, int rangeMax, int count, int mode, int levelMin, int levelMax, unordered_map<wstring, int> *scoreRequirements, const wstring &playerName, const wstring &teamName, Level *level)
|
||
{
|
||
app.DebugPrintf("getPlayers NOT IMPLEMENTED!");
|
||
return NULL;
|
||
|
||
/*if (players.empty()) return NULL;
|
||
vector<shared_ptr<ServerPlayer> > result = new vector<shared_ptr<ServerPlayer> >();
|
||
bool reverse = count < 0;
|
||
bool playerNameNot = !playerName.empty() && playerName.startsWith("!");
|
||
bool teamNameNot = !teamName.empty() && teamName.startsWith("!");
|
||
int rangeMinSqr = rangeMin * rangeMin;
|
||
int rangeMaxSqr = rangeMax * rangeMax;
|
||
count = Mth.abs(count);
|
||
|
||
if (playerNameNot) playerName = playerName.substring(1);
|
||
if (teamNameNot) teamName = teamName.substring(1);
|
||
|
||
for (int i = 0; i < players.size(); i++) {
|
||
ServerPlayer player = players.get(i);
|
||
|
||
if (level != null && player.level != level) continue;
|
||
if (playerName != null) {
|
||
if (playerNameNot == playerName.equalsIgnoreCase(player.getAName())) continue;
|
||
}
|
||
if (teamName != null) {
|
||
Team team = player.getTeam();
|
||
String actualName = team == null ? "" : team.getName();
|
||
if (teamNameNot == teamName.equalsIgnoreCase(actualName)) continue;
|
||
}
|
||
|
||
if (position != null && (rangeMin > 0 || rangeMax > 0)) {
|
||
float distance = position.distSqr(player.getCommandSenderWorldPosition());
|
||
if (rangeMin > 0 && distance < rangeMinSqr) continue;
|
||
if (rangeMax > 0 && distance > rangeMaxSqr) continue;
|
||
}
|
||
|
||
if (!meetsScoreRequirements(player, scoreRequirements)) continue;
|
||
|
||
if (mode != GameType.NOT_SET.getId() && mode != player.gameMode.getGameModeForPlayer().getId()) continue;
|
||
if (levelMin > 0 && player.experienceLevel < levelMin) continue;
|
||
if (player.experienceLevel > levelMax) continue;
|
||
|
||
result.add(player);
|
||
}
|
||
|
||
if (position != null) Collections.sort(result, new PlayerDistanceComparator(position));
|
||
if (reverse) Collections.reverse(result);
|
||
if (count > 0) result = result.subList(0, Math.min(count, result.size()));
|
||
|
||
return result;*/
|
||
}
|
||
|
||
bool PlayerList::meetsScoreRequirements(shared_ptr<Player> player, unordered_map<wstring, int> scoreRequirements)
|
||
{
|
||
app.DebugPrintf("meetsScoreRequirements NOT IMPLEMENTED!");
|
||
return false;
|
||
|
||
//if (scoreRequirements == null || scoreRequirements.size() == 0) return true;
|
||
|
||
//for (Map.Entry<String, Integer> requirement : scoreRequirements.entrySet()) {
|
||
// String name = requirement.getKey();
|
||
// boolean min = false;
|
||
|
||
// if (name.endsWith("_min") && name.length() > 4) {
|
||
// min = true;
|
||
// name = name.substring(0, name.length() - 4);
|
||
// }
|
||
|
||
// Scoreboard scoreboard = player.getScoreboard();
|
||
// Objective objective = scoreboard.getObjective(name);
|
||
// if (objective == null) return false;
|
||
// Score score = player.getScoreboard().getPlayerScore(player.getAName(), objective);
|
||
// int value = score.getScore();
|
||
|
||
// if (value < requirement.getValue() && min) {
|
||
// return false;
|
||
// } else if (value > requirement.getValue() && !min) {
|
||
// return false;
|
||
// }
|
||
//}
|
||
|
||
//return true;
|
||
}
|
||
|
||
void PlayerList::sendMessage(const wstring& name, const wstring& message)
|
||
{
|
||
shared_ptr<ServerPlayer> player = getPlayer(name);
|
||
if (player != NULL)
|
||
{
|
||
player->connection->send( shared_ptr<ChatPacket>( new ChatPacket(message) ) );
|
||
}
|
||
}
|
||
|
||
void PlayerList::broadcast(double x, double y, double z, double range, int dimension, shared_ptr<Packet> packet)
|
||
{
|
||
broadcast(nullptr, x, y, z, range, dimension, packet);
|
||
}
|
||
|
||
void PlayerList::broadcast(shared_ptr<Player> except, double x, double y, double z, double range, int dimension, shared_ptr<Packet> packet)
|
||
{
|
||
// 4J - altered so that we don't send to the same machine more than once. Add the source player to the machines we have "sent" to as it doesn't need to go to that
|
||
// machine either
|
||
vector< shared_ptr<ServerPlayer> > sentTo;
|
||
if( except != NULL )
|
||
{
|
||
sentTo.push_back(dynamic_pointer_cast<ServerPlayer>(except));
|
||
}
|
||
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
shared_ptr<ServerPlayer> p = players[i];
|
||
if (p == except) continue;
|
||
if (p->dimension != dimension) continue;
|
||
|
||
// 4J - don't send to the same machine more than once
|
||
bool dontSend = false;
|
||
if( sentTo.size() )
|
||
{
|
||
INetworkPlayer *thisPlayer = p->connection->getNetworkPlayer();
|
||
if( thisPlayer == NULL )
|
||
{
|
||
dontSend = true;
|
||
}
|
||
else
|
||
{
|
||
for(unsigned int j = 0; j < sentTo.size(); j++ )
|
||
{
|
||
shared_ptr<ServerPlayer> player2 = sentTo[j];
|
||
INetworkPlayer *otherPlayer = player2->connection->getNetworkPlayer();
|
||
if( otherPlayer != NULL && thisPlayer->IsSameSystem(otherPlayer) )
|
||
{
|
||
dontSend = true;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
if( dontSend )
|
||
{
|
||
continue;
|
||
}
|
||
|
||
|
||
double xd = x - p->x;
|
||
double yd = y - p->y;
|
||
double zd = z - p->z;
|
||
if (xd * xd + yd * yd + zd * zd < range * range)
|
||
{
|
||
#if 0 // _DEBUG
|
||
shared_ptr<LevelSoundPacket> SoundPacket= dynamic_pointer_cast<LevelSoundPacket>(packet);
|
||
|
||
if(SoundPacket)
|
||
{
|
||
|
||
app.DebugPrintf("---broadcast - eSoundType_[%d] ",SoundPacket->getSound());
|
||
OutputDebugStringW(ConsoleSoundEngine::wchSoundNames[SoundPacket->getSound()]);
|
||
app.DebugPrintf("\n");
|
||
}
|
||
#endif
|
||
p->connection->send(packet);
|
||
sentTo.push_back( p );
|
||
}
|
||
}
|
||
|
||
}
|
||
|
||
void PlayerList::saveAll(ProgressListener *progressListener, bool bDeleteGuestMaps /*= false*/)
|
||
{
|
||
if(progressListener != NULL) progressListener->progressStart(IDS_PROGRESS_SAVING_PLAYERS);
|
||
// 4J - playerIo can be NULL if we have have to exit a game really early on due to network failure
|
||
if(playerIo)
|
||
{
|
||
playerIo->saveAllCachedData();
|
||
for (unsigned int i = 0; i < players.size(); i++)
|
||
{
|
||
playerIo->save(players[i]);
|
||
|
||
//4J Stu - We don't want to save the map data for guests, so when we are sure that the player is gone delete the map
|
||
if(bDeleteGuestMaps && players[i]->isGuest()) playerIo->deleteMapFilesForPlayer(players[i]);
|
||
|
||
if(progressListener != NULL) progressListener->progressStagePercentage((i * 100)/ ((int)players.size()));
|
||
}
|
||
playerIo->clearOldPlayerFiles();
|
||
playerIo->saveMapIdLookup();
|
||
}
|
||
}
|
||
|
||
void PlayerList::whiteList(const wstring& playerName)
|
||
{
|
||
}
|
||
|
||
void PlayerList::blackList(const wstring& playerName)
|
||
{
|
||
}
|
||
|
||
void PlayerList::reloadWhitelist()
|
||
{
|
||
}
|
||
|
||
void PlayerList::sendLevelInfo(shared_ptr<ServerPlayer> player, ServerLevel *level)
|
||
{
|
||
player->connection->send( shared_ptr<SetTimePacket>( new SetTimePacket(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)) ) );
|
||
if (level->isRaining())
|
||
{
|
||
player->connection->send( shared_ptr<GameEventPacket>( new GameEventPacket(GameEventPacket::START_RAINING, 0) ) );
|
||
}
|
||
else
|
||
{
|
||
// 4J Stu - Fix for #44836 - Customer Encountered: Out of Sync Weather [A-10]
|
||
// If it was raining when the player left the level, and is now not raining we need to make sure that state is updated
|
||
player->connection->send( shared_ptr<GameEventPacket>( new GameEventPacket(GameEventPacket::STOP_RAINING, 0) ) );
|
||
}
|
||
|
||
// send the stronghold position if there is one
|
||
if((level->dimension->id==0) && level->getLevelData()->getHasStronghold())
|
||
{
|
||
player->connection->send( shared_ptr<XZPacket>( new XZPacket(XZPacket::STRONGHOLD,level->getLevelData()->getXStronghold(),level->getLevelData()->getZStronghold()) ) );
|
||
}
|
||
}
|
||
|
||
void PlayerList::sendAllPlayerInfo(shared_ptr<ServerPlayer> player)
|
||
{
|
||
player->refreshContainer(player->inventoryMenu);
|
||
player->resetSentInfo();
|
||
player->connection->send( shared_ptr<SetCarriedItemPacket>( new SetCarriedItemPacket(player->inventory->selected)) );
|
||
}
|
||
|
||
int PlayerList::getPlayerCount()
|
||
{
|
||
return (int)players.size();
|
||
}
|
||
|
||
int PlayerList::getPlayerCount(ServerLevel *level)
|
||
{
|
||
int count = 0;
|
||
|
||
for(auto& player : players)
|
||
{
|
||
if( player->level == level ) ++count;
|
||
}
|
||
|
||
return count;
|
||
}
|
||
|
||
int PlayerList::getMaxPlayers()
|
||
{
|
||
return maxPlayers;
|
||
}
|
||
|
||
MinecraftServer *PlayerList::getServer()
|
||
{
|
||
return server;
|
||
}
|
||
|
||
int PlayerList::getViewDistance()
|
||
{
|
||
return viewDistance;
|
||
}
|
||
|
||
void PlayerList::setOverrideGameMode(GameType *gameMode)
|
||
{
|
||
overrideGameMode = gameMode;
|
||
}
|
||
|
||
void PlayerList::updatePlayerGameMode(shared_ptr<ServerPlayer> newPlayer, shared_ptr<ServerPlayer> oldPlayer, Level *level)
|
||
{
|
||
|
||
// reset the player's game mode (first pick from old, then copy level if
|
||
// necessary)
|
||
if (oldPlayer != NULL)
|
||
{
|
||
newPlayer->gameMode->setGameModeForPlayer(oldPlayer->gameMode->getGameModeForPlayer());
|
||
}
|
||
else if (overrideGameMode != NULL)
|
||
{
|
||
newPlayer->gameMode->setGameModeForPlayer(overrideGameMode);
|
||
}
|
||
newPlayer->gameMode->updateGameMode(level->getLevelData()->getGameType());
|
||
}
|
||
|
||
void PlayerList::setAllowCheatsForAllPlayers(bool allowCommands)
|
||
{
|
||
this->allowCheatsForAllPlayers = allowCommands;
|
||
}
|
||
|
||
shared_ptr<ServerPlayer> PlayerList::findAlivePlayerOnSystem(shared_ptr<ServerPlayer> player)
|
||
{
|
||
int dimIndex, playerDim;
|
||
dimIndex = playerDim = player->dimension;
|
||
if( dimIndex == -1 ) dimIndex = 1;
|
||
else if( dimIndex == 1) dimIndex = 2;
|
||
|
||
INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
|
||
if( thisPlayer )
|
||
{
|
||
for(auto& newPlayer : players)
|
||
{
|
||
INetworkPlayer *otherPlayer = newPlayer->connection->getNetworkPlayer();
|
||
|
||
if( !newPlayer->removed &&
|
||
newPlayer != player &&
|
||
newPlayer->dimension == playerDim &&
|
||
otherPlayer &&
|
||
otherPlayer->IsSameSystem( thisPlayer )
|
||
)
|
||
{
|
||
return newPlayer;
|
||
}
|
||
}
|
||
}
|
||
|
||
return nullptr;
|
||
}
|
||
|
||
void PlayerList::removePlayerFromReceiving(shared_ptr<ServerPlayer> player, bool usePlayerDimension /*= true*/, int dimension /*= 0*/)
|
||
{
|
||
int dimIndex, playerDim;
|
||
dimIndex = playerDim = usePlayerDimension ? player->dimension : dimension;
|
||
if( dimIndex == -1 ) dimIndex = 1;
|
||
else if( dimIndex == 1) dimIndex = 2;
|
||
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Requesting remove player %ls as primary in dimension %d\n", player->name.c_str(), dimIndex);
|
||
#endif
|
||
bool playerRemoved = false;
|
||
|
||
auto it = find(receiveAllPlayers[dimIndex].begin(), receiveAllPlayers[dimIndex].end(), player);
|
||
if( it != receiveAllPlayers[dimIndex].end() )
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Remove: Removing player %ls as primary in dimension %d\n", player->name.c_str(), dimIndex);
|
||
#endif
|
||
receiveAllPlayers[dimIndex].erase(it);
|
||
playerRemoved = true;
|
||
}
|
||
|
||
INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
|
||
if( thisPlayer && playerRemoved )
|
||
{
|
||
for(auto& newPlayer : players)
|
||
{
|
||
INetworkPlayer *otherPlayer = newPlayer->connection->getNetworkPlayer();
|
||
|
||
if( newPlayer != player &&
|
||
newPlayer->dimension == playerDim &&
|
||
otherPlayer &&
|
||
otherPlayer->IsSameSystem( thisPlayer )
|
||
)
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Remove: Adding player %ls as primary in dimension %d\n", newPlayer->name.c_str(), dimIndex);
|
||
#endif
|
||
receiveAllPlayers[dimIndex].push_back( newPlayer );
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
else if( thisPlayer == NULL )
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Remove: Qnet player for %ls was NULL so re-checking all players\n", player->name.c_str() );
|
||
#endif
|
||
// 4J Stu - Something went wrong, or possibly the QNet player left before we got here.
|
||
// Re-check all active players and make sure they have someone on their system to receive all packets
|
||
for(auto& newPlayer : players)
|
||
{
|
||
INetworkPlayer *checkingPlayer = newPlayer->connection->getNetworkPlayer();
|
||
|
||
if( checkingPlayer )
|
||
{
|
||
int newPlayerDim = 0;
|
||
if( newPlayer->dimension == -1 ) newPlayerDim = 1;
|
||
else if( newPlayer->dimension == 1) newPlayerDim = 2;
|
||
bool foundPrimary = false;
|
||
for(auto& primaryPlayer : receiveAllPlayers[newPlayerDim])
|
||
{
|
||
INetworkPlayer *primPlayer = primaryPlayer->connection->getNetworkPlayer();
|
||
if(primPlayer != NULL && checkingPlayer->IsSameSystem( primPlayer ) )
|
||
{
|
||
foundPrimary = true;
|
||
break;
|
||
}
|
||
}
|
||
if(!foundPrimary)
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Remove: Adding player %ls as primary in dimension %d\n", newPlayer->name.c_str(), newPlayerDim);
|
||
#endif
|
||
receiveAllPlayers[newPlayerDim].push_back( newPlayer );
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
void PlayerList::addPlayerToReceiving(shared_ptr<ServerPlayer> player)
|
||
{
|
||
int playerDim = 0;
|
||
if( player->dimension == -1 ) playerDim = 1;
|
||
else if( player->dimension == 1) playerDim = 2;
|
||
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Requesting add player %ls as primary in dimension %d\n", player->name.c_str(), playerDim);
|
||
#endif
|
||
|
||
bool shouldAddPlayer = true;
|
||
|
||
INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
|
||
|
||
if( thisPlayer == NULL )
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Add: Qnet player for player %ls is NULL so not adding them\n", player->name.c_str() );
|
||
#endif
|
||
shouldAddPlayer = false;
|
||
}
|
||
else
|
||
{
|
||
for(auto& oldPlayer : receiveAllPlayers[playerDim])
|
||
{
|
||
INetworkPlayer *checkingPlayer = oldPlayer->connection->getNetworkPlayer();
|
||
if(checkingPlayer != NULL && checkingPlayer->IsSameSystem( thisPlayer ) )
|
||
{
|
||
shouldAddPlayer = false;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if( shouldAddPlayer )
|
||
{
|
||
#ifndef _CONTENT_PACKAGE
|
||
app.DebugPrintf("Add: Adding player %ls as primary in dimension %d\n", player->name.c_str(), playerDim);
|
||
#endif
|
||
receiveAllPlayers[playerDim].push_back( player );
|
||
}
|
||
}
|
||
|
||
bool PlayerList::canReceiveAllPackets(shared_ptr<ServerPlayer> player)
|
||
{
|
||
int playerDim = 0;
|
||
if( player->dimension == -1 ) playerDim = 1;
|
||
else if( player->dimension == 1) playerDim = 2;
|
||
for(const auto& newPlayer : receiveAllPlayers[playerDim])
|
||
{
|
||
if(newPlayer == player)
|
||
{
|
||
return true;
|
||
}
|
||
}
|
||
return false;
|
||
}
|
||
|
||
void PlayerList::kickPlayerByShortId(BYTE networkSmallId)
|
||
{
|
||
EnterCriticalSection(&m_kickPlayersCS);
|
||
m_smallIdsToKick.push_back(networkSmallId);
|
||
LeaveCriticalSection(&m_kickPlayersCS);
|
||
}
|
||
|
||
void PlayerList::closePlayerConnectionBySmallId(BYTE networkSmallId)
|
||
{
|
||
EnterCriticalSection(&m_closePlayersCS);
|
||
m_smallIdsToClose.push_back(networkSmallId);
|
||
LeaveCriticalSection(&m_closePlayersCS);
|
||
}
|
||
|
||
void PlayerList::queueSmallIdForRecycle(BYTE smallId)
|
||
{
|
||
EnterCriticalSection(&m_closePlayersCS);
|
||
m_smallIdsToClose.push_back(smallId);
|
||
LeaveCriticalSection(&m_closePlayersCS);
|
||
}
|
||
|
||
bool PlayerList::isXuidBanned(PlayerUID xuid)
|
||
{
|
||
if( xuid == INVALID_XUID ) return false;
|
||
|
||
bool banned = false;
|
||
|
||
for(PlayerUID it : m_bannedXuids)
|
||
{
|
||
if( ProfileManager.AreXUIDSEqual( xuid, it ) )
|
||
{
|
||
banned = true;
|
||
break;
|
||
}
|
||
}
|
||
|
||
return banned;
|
||
}
|
||
|
||
// AP added for Vita so the range can be increased once the level starts
|
||
void PlayerList::setViewDistance(int newViewDistance)
|
||
{
|
||
viewDistance = newViewDistance;
|
||
}
|