Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-05 18:32:28 +01:00
Code Issues Projects Releases Wiki Activity
4,267 Commits 17 Branches 0 Tags 229 MiB
45071cebd8
Commit Graph

3834 Commits

Author SHA1 Message Date
Шандуренко Константин Владимирович
e990283c40 Resolving inventory- events and condition issues 2021-09-10 18:38:27 +03:00
Шандуренко Константин Владимирович
98fc704139 BlockHandlerBase 2021-09-10 16:50:38 +03:00
Шандуренко Константин Владимирович
e3600525fa BlockManager#registerStatelessHandler 2021-09-10 16:48:01 +03:00
Шандуренко Константин Владимирович
f45484c840 Removed synchronization on BlockManager methods, related to handlers 2021-09-10 16:45:04 +03:00
Шандуренко Константин Владимирович
2f2254ebc2 Setting up BlockHandler for blocks loaded by AnvilLoader 2021-09-10 16:42:59 +03:00
TheMode
6355f06d53 Compression buffer has now multiple purpose 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-10 06:35:34 +02:00
TheMode
3ddf729a46 Code style, remove deprecated ChatMode 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-10 05:50:08 +02:00
TheMode
e6db47ec6e Add fancy Player#sendPacket shortcut 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-10 05:41:54 +02:00
TheMode
fd027ecfd7 Do not forget to put the buffer back in the pool queue 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 23:18:14 +02:00
TheMode
526108b896 Remove unnecessary allocation during encryption 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 23:15:57 +02:00
TheMode
344003f36a VanillaStackingRule style 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 23:14:59 +02:00
TheMode
f48199397a Simplify acquisition 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 20:49:54 +02:00
TheMode
acb8634b4b Acquirable style cleanup 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 17:16:20 +02:00
TheMode
1c719a2fd7 Make getChunkCoordinate smarter and more efficient 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 06:57:46 +02:00
TheMode
6ab94bb778 One less magic value 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 00:26:10 +02:00
TheMode
d7a116c144 Prevent buffer being resized in writeFramedPacket, it is now possible to know if a buffer couldn't be written to 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 22:26:18 +02:00
TheMode
f023b1bc07 Simplify writeVarIntHeader 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 22:23:37 +02:00
TheMode
21bac6fba4 Better name for the local deflater, add link to the packet format 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 20:31:13 +02:00
Moulberry
788bb71587 Fix initial startCondition of DOUBLE_CLICK being wrong as well 2021-09-08 23:22:22 +08:00
Moulberry
08c9339fae Fix double-click calling startCondition on the wrong inventory 2021-09-08 22:55:48 +08:00
Moulberry
571624a952 Fix duplication glitch with shift-click 2021-09-08 22:45:11 +08:00
Moulberry
9e5fadaa0e Fix broken cursor with window items packet 2021-09-08 21:50:14 +08:00
TheMode
025052102d Ensure positive chunk view distance from the client 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 05:24:59 +02:00
TheMode
ffbc8e5f27 Fix Player#getLocale 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 00:54:00 +02:00
TheMode
3e386a1491 Send unload packet 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 21:26:24 +02:00
TheMode
e1c4a7afce Fix chunk 0 being sent multiple time 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 20:14:15 +02:00
TheMode
4a260b98c2 Simplify/Improve getChunksInRange 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 19:58:26 +02:00
Шандуренко Константин Владимирович
6c4eda3bb7 Chunk-related improvements 2021-09-07 19:24:24 +03:00
TheMode
4b7adae382 Make DimensionTypeManager thread-safe 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 16:47:14 +02:00
TheMode
1c76fd152e Fix viewable packet when a connection has multiple pairs 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 04:47:33 +02:00
TheMode
adf1023e35 There is no commit here - fix compression 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 01:31:34 +02:00
TheMode
8f1e84ffdb Prevent framed packets from being corrupted 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 01:24:51 +02:00
Шандуренко Константин Владимирович
85da1c073a Marked AbstractInventory with @NonExtendable 2021-09-06 21:10:40 +03:00
Шандуренко Константин Владимирович
2634042f7d InventoryItemChangeEvent is now recursive and not it's PlayerInventory-based child 2021-09-06 20:27:11 +03:00
Шандуренко Константин Владимирович
8f277cdb17 Removed unused imports 2021-09-06 20:24:20 +03:00
Шандуренко Константин Владимирович
5db56312f7 Code review 2021-09-06 20:23:37 +03:00
Шандуренко Константин Владимирович
8a04d7eed9 InventoryItemChangeEvent 2021-09-06 19:59:55 +03:00
TheMode
72987ac52f Save the server from crashing from OOM due to the client or server not being able to handle the network load 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-06 16:17:30 +02:00
TheMode
b2a0b91a45 Add warning in PacketUtils 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-06 13:40:11 +02:00
TheMode
02d927cc4d Rename internal registry constant holder interfaces 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-06 13:32:52 +02:00
TheMode
f3ee80d126 Create a separate method to init & start the socket server 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 22:03:51 +02:00
TheMode
2a8719e1e4 Make collections mutable in the meta builder 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 18:48:10 +02:00
TheMode
8cbd6460f4 Cleanup... 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 03:40:30 +02:00
TheMode
026550ac07 Simplify PacketUtils 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 02:50:59 +02:00
TheMode
7b8277b6be Do not flip the buffer inside #write(ByteBuffer) 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 23:56:27 +02:00
TheMode
885be567fa Avoid slice allocation 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 19:50:09 +02:00
TheMode
d21414c146 Handle prepared buffer being bigger than the pooled ones 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 19:30:18 +02:00
TheMode
f717279adc Independent socket send & receive buffer size 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 16:43:45 +02:00
TheMode
96bfc4c6fa Add getters for chunk coordinates in Point 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 15:29:20 +02:00
TheMode
8f17d52efa Merge branch 'master' into viewable-broadcast 2021-09-04 12:27:09 +02:00
TheMode
22b0c70500 Ensure that the read buffer can contain a single full packet 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 03:40:22 +02:00
TheMode
4f382c5684 Fix tick allocation 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 03:03:06 +02:00
TheMode
9353c56460 Fix build 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 02:25:09 +02:00
TheMode
2c1e3e4323 Merge branch 'master' into viewable-broadcast 
# Conflicts:
#	src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
 2021-09-04 02:22:52 +02:00
TheMode
df92939ddd Use soft references for pooled buffers 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 02:20:03 +02:00
TheMode
4075272a16 Disconnection should not be synchronized on the buffer lock 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 17:27:47 +02:00
TheMode
efb39c2ece Flush cleanup & prevent double allocation 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 16:51:00 +02:00
TheMode
e19b49db55 Merge branch 'master' into viewable-broadcast 
# Conflicts:
#	src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
 2021-09-03 14:01:39 +02:00
TheMode
538ef75552 Sending chunks should be thread safe 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 13:57:19 +02:00
TheMode
3d5ae6fe94 Pool main connection buffer 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 13:54:38 +02:00
TheMode
400109df0a Fix potential packet corruption 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 13:43:00 +02:00
TheMode
4b2bda15f5 Merge branch 'master' into viewable-broadcast 
# Conflicts:
#	src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
 2021-09-02 18:50:55 +02:00
TheMode
d4e51f562c Remove threadlocal buffer cache in ChunkDataPacket 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-02 18:44:50 +02:00
TheMode
399eb860a7 Improve performance when slow clients are connected 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-02 15:44:36 +02:00
TheMode
463a46ccc0 Set socket size to max packet size 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-01 18:21:51 +02:00
TheMode
0f2d850dce More Throwable handling 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-01 17:15:49 +02:00
TheMode
9bb4043571 Remove legacy weirdness 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-01 11:56:09 +02:00
Шандуренко Константин Владимирович
224345853e BoundingBox#PositionedPoints is immutable now 2021-08-31 16:16:43 +03:00
Шандуренко Константин Владимирович
32b33d6bf9 Code review 2021-08-31 15:55:24 +03:00
Шандуренко Константин Владимирович
34ec59dc68 ImmutableList.of() to List.of() 2021-08-31 15:52:38 +03:00
Шандуренко Константин Владимирович
a69cefd8d4 Fixing BoundingBoxes caching 2021-08-31 15:39:39 +03:00
iam4722202468
063a4dc392 Fix cursor item not being set properly when inventory click event is cancelled 2021-08-31 03:45:54 -04:00
Matt Worzala
220a4db768
mark BundleMeta experimental, shorten material nsid access 2021-08-30 18:09:08 -04:00
Matt Worzala
868c5ba044
add array copy 2021-08-30 18:04:46 -04:00
Matt Worzala
5b8051e2e8
experimental tags, docs, shorten item creation 2021-08-30 18:00:57 -04:00
Matt Worzala
8291639749
add BundleMeta and full item to/from nbt 2021-08-30 17:51:19 -04:00
TheMode
ebb179da7c You didn't see anything 2021-08-30 19:47:30 +02:00
TheMode
e99d8c6a6f Add BlockHandler.PlayerPlacement#getHand 2021-08-30 15:52:07 +02:00
TheMode
ae04ca5574 More comments for ListenerHandle 2021-08-30 12:33:09 +02:00
TheMode
a92ac203f7 Style cleanup 2021-08-29 17:11:10 +02:00
TheMode
61d19243f7 Fix event expiration 2021-08-29 12:50:44 +02:00
TheMode
8b61ead08e Fix parent filtering 2021-08-29 12:25:57 +02:00
TheMode
0a3ad69e58 Ensure listeners being up to date 2021-08-29 01:03:09 +02:00
TheMode
a75910fe3f Fix drag clicks 2021-08-29 00:07:58 +02:00
EpicPlayerA10
8b7fb7a7c5 Add missing husk 2021-08-28 21:10:56 +02:00
jglrxavpok
9f97c985aa Make javadoc build again 2021-08-28 17:09:07 +02:00
Xavier Niochaut
7b046c2225
Merge pull request #436 from Minestom/feature/thread-bound-tasks 
Fix GLFW-based framebuffers not using the proper threads
 2021-08-28 16:50:59 +02:00
jglrxavpok
07a05a6ed2 Remove unused import 2021-08-28 16:45:06 +02:00
jglrxavpok
4184602eb0 oops wrong line 2021-08-28 14:30:49 +02:00
jglrxavpok
b9f1f75249 Cleanup un-needed changes 2 2021-08-28 14:28:45 +02:00
jglrxavpok
b1b1e70c40 Cleanup un-needed changes 2021-08-28 14:27:52 +02:00
jglrxavpok
85ca2a5302 No longer expose Thread-binding to Task API 2021-08-28 14:20:47 +02:00
TheMode
4d0924a522 Can now specify InstanceContainer chunk loader during initialization 2021-08-28 13:06:09 +02:00
TheMode
bf847fac79 Oops position 2021-08-28 11:51:39 +02:00
TheMode
9739403ff4 Properly update the client position when switching vehicle 2021-08-28 11:37:42 +02:00
TheMode
34ba838ab5 Improve movement cancelling 2021-08-28 11:28:14 +02:00
TheMode
4680dbd64e Reuse call method for mapped nodes 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-08-27 09:55:10 +02:00
TheMode
5c9c57439a Prevent node update from being called multiple times 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-08-27 09:51:36 +02:00
jglrxavpok
42938111d5 Allow tasks to be bound to the same thread for each run. 2021-08-26 19:50:28 +02:00
TheMode
f7cd0def20 Add dedicated CachedPacket for future network optimizations 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-08-26 18:18:35 +02:00
TheMode
b60b785dcd Fix unhandled exception 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-08-26 17:59:51 +02:00
Matthew
75964f87b4 Merge Task#scheduleForShutdown into Task#schedule 2021-08-26 11:22:08 -04:00
Matthew
1c92414cad Add TaskBuilder#build 2021-08-26 11:22:08 -04:00
Matthew
2674ca933e Move functionality from TaskBuilder#schedule to Task#schedule and Task#scheduleForShutdown 2021-08-26 11:22:08 -04:00
Matt Worzala
3ce51ff470 switch permission level back to an int internally 2021-08-26 11:12:03 -04:00
kiipy
6eac7282af Made Player#setPermissionLevel persistent after death. 2021-08-26 11:12:03 -04:00
TheMode
66681c5caf Use an array for filtering 2021-08-26 14:25:13 +02:00
TheMode
d56479d316 Ensure that child also invalidate events 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-08-26 13:24:16 +02:00
TheMode
af82bf1236 Reduce allocations for chunk packet writing 2021-08-26 10:55:56 +02:00
TheMode
024f8d36bd API cleanup 2021-08-26 10:36:31 +02:00
LeoDog896
811e3c542b Fix up tab completion for EntityType 2021-08-25 18:35:51 -04:00
TheMode
748b24b8ef Expand block properties error 2021-08-25 18:26:45 +02:00
TheMode
73f125763c Use a lock + weak map 2021-08-25 17:25:08 +02:00
TheMode
e185bca468 Fix obvious packet corruption 2021-08-25 13:54:09 +02:00
TheMode
5e18f48a1b Cleanup 2021-08-25 10:45:35 +02:00
TheMode
2ae0c0bbcd Batch movement packets 2021-08-25 09:01:13 +02:00
TheMode
6520855418 Fix buffer offset 2021-08-24 21:21:51 +02:00
TheMode
5ddd97cee2 Move optimized event calling inside ListenerHandle 2021-08-24 15:35:09 +02:00
TheMode
aed441123e Marks some methods as experimental 2021-08-24 15:25:11 +02:00
TheMode
93cbd52313 Use arrays instead of lists for loops 2021-08-24 15:12:39 +02:00
TheMode
ec66beece4 Initial viewable broadcast attempt 2021-08-24 14:59:17 +02:00
TheMode
5e27399815 Fix event propagation on self 2021-08-24 11:49:57 +02:00
Kiip
b1c1f65064
Fix minestom.com > minestom.net 2021-08-24 11:33:02 +02:00
TheMode
4825f8d4c1 Add EquipmentHandler#hasEquipment 2021-08-24 08:26:04 +02:00
TheMode
2cf4e89694 Implement shift-click equip 2021-08-24 07:23:44 +02:00
TheMode
7740c45982 Fix node child removal 2021-08-23 18:43:20 +02:00
TheMode
dc59f3fd23 Make auth requests async 2021-08-23 08:53:08 +02:00
TheMode
8fa590fdcd Fix drag clicks 2021-08-23 04:02:06 +02:00
TheMode
2450e741e6 Catch Throwable instead of Exception 2021-08-23 03:46:10 +02:00
TheMode
f1c9268897 Catch Throwable instead of Exception 2021-08-22 18:35:19 +02:00
TheMode
1b55bd0137
Merge pull request #428 from RinesThaix/getLineOfSightEntity 
Entity#getLineOfSightEntity and BoundingBox#intersect(Point, Point)
 2021-08-22 16:52:13 +02:00
Шандуренко Константин Владимирович
66e8ac2dc3 Code review 2021-08-22 17:47:52 +03:00
TheMode
253c059614 Do not run chunk load callback in the instance thread 2021-08-22 16:44:24 +02:00
Шандуренко Константин Владимирович
f2f592209a Entity#getLineOfSightEntity and BoundingBox#intersect(Point, Point) 2021-08-22 16:56:34 +03:00
TheMode
91983e16eb Prevent the server from stopping twice 2021-08-22 14:29:46 +02:00
TheMode
01e39b5d98
Merge pull request #427 from AlexDicy/master 
Handle Ctrl+C and SIGINT signal
 2021-08-22 14:28:18 +02:00
TheMode
93fc7235e0 Fix context being null in globalListener 2021-08-22 14:22:06 +02:00
Lorenzo Lapucci
74abe0439b
Merge branch 'Minestom:master' into master 2021-08-22 14:13:01 +02:00
Lorenzo Lapucci
c61a3dcd12 Stop the server on Ctrl+C and SIGINT signal 2021-08-22 14:12:38 +02:00
TheMode
129a39fc3d Proper place for global event ListenerHandles 2021-08-22 13:56:12 +02:00
TheMode
a8d90955c7 Fix chunks being registered multiple times (weirdly only happen on Windows?) 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-08-22 09:57:39 +02:00
TheMode
8fae759a71
Merge pull request #426 from Kebab11noel/fix/number-range 
Fix range parsing and reduce boilerplate
 2021-08-22 08:47:58 +02:00
Németh Noel
f633cef273 Change argument order, restrict range type 2021-08-22 08:45:39 +02:00
Németh Noel
293786854b Fix range parsing 2021-08-22 08:36:02 +02:00
TheMode
898252dad0 Fast exit if the player didn't move 2021-08-22 08:13:28 +02:00
TheMode
18b0e21f21 Start using ListenerHandle 2021-08-22 07:47:06 +02:00
TheMode
8acb2e292c Move potion effect tick into its own method 2021-08-22 07:34:11 +02:00
TheMode
ef58d770b4 Move block collision code into its own method 2021-08-22 07:31:47 +02:00
TheMode
2dbf795d5c Fix ArgumentBlockState not throwing an exception when properties are incorrect 2021-08-22 07:13:50 +02:00
TheMode
a519360a8d Fix ArgumentNumber range error 2021-08-22 06:05:28 +02:00