1
0
Fork 0
Commit Graph

659 Commits

Author SHA1 Message Date
ElNounch d75bbdd03d Fixing string literal catching word letter as hexa-digit
Was sending "\x08C""uberite" as plugin identifier, aka a String of lenght (Varint 0x8c 0x75 ->) 14988 characters but only 7 provided
Now sending "\x08""Cuberite" as plugin identifier, aka a String of lenght (Varint 0x08 ->) 8 characters, with 8 provided
Fix BungeeCord compatibility
2016-08-17 07:37:48 +00:00
Mathias e7b4d7a776 Dropped 1.7 support (#3253) 2016-07-21 09:47:42 +02:00
Mattes D 8eaa8613da CMake: Remove needless minimum version specifications. 2016-07-18 22:11:42 +02:00
beeduck db65e11d57 Fixes for boat entities (#3265)
protocol for vehicles now properly handled, protocol for boat paddles now properly handled, boats can no longer spawn underwater, boats now properly float, boat metadata now properly broadcasted.
2016-07-18 22:10:00 +02:00
Pokechu22 a4f327118b 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)
* Semistable update to 15w31a

I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written.

* Update to 15w34b protocol

Also, fix an issue with the Entity Equipment packet from the past version.  Clients are able to connect and do stuff!

* Partially update to 15w35e

Chunk data doesn't work, but the client joins.  I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d.

* Add '/blk' debug command

This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible.

* Fix CRLF normalization in CheckBasicStyle.lua

Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line.  Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't.

The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored.

* Update to 15w40b

This includes chunk serialization.  Fully functional chunk serialization for 1.9.

I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later.  The creation of a full buffer is suboptimal, but it's the easiest way to implement this code.

* Write long-by-long rather than creating a buffer

This is a bit faster and should be equivalent.  However, the code still doesn't look too good.

* Update to 15w41a protocol

This includes the new set passengers packet, which works off of the ridden entity, not the rider.  That means, among other things, that information about the previously ridden vehicle is needed when detaching.  So a new method with that info was added.

* Update to 15w45a

* 15w51b protocol

* Update to 1.9.0 protocol

Closes #3067.  There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work.  I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes).  Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks).

* Fix item pickup packet not working

That was a silly mistake, but at least it was an easy one.

* 1.9.2 protocol support

* Fix version info found in server list ping

Thus, the client reports that it can connect rather than saying that the server is out of date.  This required creating separate classes for 1.9.1 and 1.9.2, unfortunately.

* Fix build errors generated by clang

These didn't happen in MSVC.

* Add protocol19x.cpp and protocol19x.h to CMakeLists

* Ignore warnings in protocol19x that are ignored in protocol18x

* Document BLOCK_FACE and DIG_STATUS constants

* Fix BLOCK_FACE links and add separate section for DIG_STATUS

* Fix bat animation and object spawning

The causes of both of these are explained in #3135, but the gist is that both were typos.

* Implement Use Item packet

This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block.

* Handle DIG_STATUS_SWAP_ITEM_IN_HAND

* Add support for spawn eggs and potions

The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending.

* Remove spammy potion debug logging

* Fix wolf collar color metadata

The wrong type was being used, causing several clientside issues (including the screen going black).

* Fix 1.9 chunk sending in the nether

The nether and the end don't send skylight.

* Fix clang build errors

* Fix water bottles becoming mundane potions

This happened because the can become splash potion bit got set incorrectly.  Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion.

Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging.

* Copy Protocol18x as Protocol19x

Aditionally, method and class names have been swapped to clean up other diffs.  This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names).

* Make thrown potions use the correct appearence

This was caused by potions now using metadata.

* Add missing api doc for cSplashPotionEntity::GetItem

* Fix compile error in SplashPotionEntity.cpp

* Fix fix of cSplashPotionEntity API doc

* Temporarilly disable fall damage particles

These were causing issues in 1.9 due to the changed effect ID.

* Properly send a kick packet when connecting with an invalid version

This means that the client no longer waits on the server screen with no indication whatsoever.  However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping.

I also added a GetVarIntSize method to cByteBuffer.  This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way).

* Handle server list pings from unrecognized versions

This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse).

* Use cPacketizer for the disconnect packet

This also should fix clang build errors.

* Add 1.9.3 / 1.9.4 support

* Fix incorrect indentation in APIDesc
2016-05-14 20:12:42 +01:00
LogicParrot ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
bibo38 657b0ed007 Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8
The NBT format now carries the texture data and transmit it to the client.
See: http://minecraft.gamepedia.com/Head#Block_entity
Related to #2674
2016-01-11 17:55:32 +01:00
bibo38 a45315ee74 Fixed not working packet decompression
A compressed packed contains always the uncompressed size, but in the code this size was threatened as the compressed data size. This created a failure, when the client compressed a packet.
See: http://wiki.vg/Protocol#With_compression
Fixes #2841
Fixes #2467
2016-01-10 15:16:29 +01:00
Mattes D 491dbda7d3 Fixed Clang warnings. 2016-01-06 16:20:12 +01:00
Mattes D 80e1eb37dd Renamed leftover strings to Cuberite / Server, as needed.
Also upgraded the user setting file for MSVC to 2013.
2016-01-01 21:05:09 +01:00
Mattes D 0054104017 Fixed problems in cBlockingSslClientSocket. 2015-12-30 13:00:02 +01:00
worktycho 76cd723867 Added GeoTrust Root Certificate 2015-12-22 16:08:02 +00:00
Alexander Harkness 8b851d5048 Added HTTPS links wherever they are supported. 2015-12-19 14:30:32 +00:00
Lukas Pioch d620dcdd08 Moved variables into scope, removed unused variables and fixed variables 2015-12-17 10:48:36 +01:00
Gargaj 68ff0edfde allow horse control (still quite buggy) 2015-12-15 21:14:27 +01:00
Gargaj 4ae3b64b07 implement breeding 2015-11-29 20:14:28 +01:00
Gargaj 1fb89a5409 fix escaped characters in signs (fixes #1736, fixes #2170) 2015-11-24 19:51:39 +01:00
Dave Tucker 83870f9fc0 Add enum for Sound and Particle Effects
Fixes #2603

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2015-11-24 13:21:40 +00:00
Julian Laubstein 48f84cc3e9 changed mob age from char to int 2015-11-16 14:13:44 +01:00
Gargaj 6d8baa6a75 idle/deflating creeper should be -1
according to http://wiki.vg/Entities#Creeper
2015-11-09 20:06:32 +01:00
Lukas Pioch 079bb7c016 Update Loops required for JsonCPP 2015-10-26 00:16:35 +00:00
tycho e1d5e5e165 Improved types of utf 16 strings 2015-10-02 17:26:53 +02:00
worktycho 11c1686092 Merge pull request #2465 from electromatter/master
Added BungeeCord support for Protocol18x
2015-09-27 14:24:15 +01:00
Mattes D 82d9ac1e1c Namechange to Cuberite 2015-09-25 10:14:17 +02:00
electromatter a24cc01843 Merge branch 'master' into master 2015-09-21 22:44:34 -04:00
tycho fd7b87741a Refactored cProtocol Chat handling 2015-09-21 12:32:56 +01:00
Eric Chai 1ef6bd8169 added bungeecord support for protocol18x 2015-09-06 09:58:18 -04:00
Tiger Wang a341419b04 Merge pull request #2380 from cuberite/travis
Use container-based infrastructure
2015-08-20 17:18:08 +01:00
Tiger Wang de2cce9b79 Fixed food drain bugs 2015-08-20 16:26:42 +01:00
Tiger Wang 5751ba0c1c Use container-based infrastructure for Travis 2015-08-20 16:15:55 +01:00
Matti Hänninen b20294604c Fix old style casts and implicit conversions 2015-08-12 16:51:38 +03:00
Mattes D 6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney 804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
bibo38 6a27ec2ea0 Added Rabbit Metadata values.
Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation.
Fixes #1867
2015-07-17 01:09:06 +02:00
Tiger Wang eadd761a29 Merge pull request #2348 from bibo38/customname
Added CustomName and Health to sended Metadata of Monsters.
2015-07-15 22:18:11 +01:00
Julian Laubstein 8b74adcfab Merge pull request #2353 from SamJBarney/DyedArmor
Implements Dyed Leather Armor
2015-07-15 22:31:48 +02:00
Samuel Barney 561296f269 Leather Armor can now be dyed.
* Created new color class to handle dye-related coloring
2015-07-15 14:05:36 -06:00
bibo38 d364b779d1 Added CustomName and Health to sended Metadata of Monsters.
Fixes #2113
2015-07-15 19:32:10 +02:00
Tiger Wang c390604bc1 Merge pull request #2349 from cuberite/maps
Improved maps
2015-07-15 17:13:55 +01:00
Tiger Wang 8656e149c8 Improved maps 2015-07-14 21:46:30 +01:00
Hallucino 53207d3f18 Support ageable mobs
Move ageable stuff in Monster directly
2015-07-14 22:41:31 +02:00
Samuel Barney aa94a275c6 Fixes compilation failures on MacOSX 10.10
* Replace old c-style casts with c++ casts
* Added `-Wno-error=old-style-cast` to Protocol18x.cpp
2015-07-09 11:15:37 -06:00
Mattes D bebd4de144 Fixed warnings generated by 64-bit MSVC. 2015-07-07 11:50:06 +02:00
bibo38 ec628846d2 Fixed Middle-Click Button in the ClickWindow-Packet.
See http://wiki.vg/Protocol#Click_Window
The MiddleClick has the button 2 and not 0. Now you can max an item in an inventory in Creative mode, without inventory desync.
Bugfix #2260
2015-06-25 13:01:48 +02:00
Tiger Wang 6920e468ad Check the return value of InflateString
Fixes #2256
2015-06-18 11:19:41 +01:00
tycho 6687ed03a1 Removed version 29 serilization
This has been unused since support for <1.7 has been dropped.
2015-06-16 10:24:06 +01:00
jan64 be4a5a0803 Fix incorrent experience sending for 1.7 clients 2015-06-07 15:21:18 +02:00
jan64 fd964200b2 Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients 2015-06-03 18:11:12 +02:00
jan64 d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
tycho e19693e529 Merge branch 'master' into PreventNewWarnings
Conflicts:
	src/Inventory.cpp
2015-05-28 11:05:41 +01:00
Mattes D c3c30a78e1 Merge pull request #1848 from scottwillmoore/ImplementTitleCommand
Implement backend for /title command
2015-05-26 08:46:16 +02:00
tycho dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
tycho 1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
Tiger Wang 8f6788b2ef Close Ssl Socket on destroy
* Fixes #2072
2015-05-22 23:54:32 +01:00
Mattes D 90ab8a338b Added Equifax root CA.
Fixes #2076.
Closes #2081.
Ref.: #2072.
2015-05-21 10:26:45 +02:00
tycho 77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
tycho 95e06ab93f Merge branch 'master' into PreventNewWarnings
Conflicts:
	src/Blocks/BlockLeaves.h
2015-05-19 11:55:23 +01:00
tycho f2689c4887 Fixed a lot of warnings 2015-05-19 11:50:59 +01:00
Alexander Harkness fff5efedc3 Merge pull request #2019 from mc-server/OverrideArgs
Initial Implementation of command line arguments
2015-05-19 10:53:44 +01:00
Mattes D f3d6da29f7 Fixed inventory handling.
Fixes #2035.
2015-05-16 23:22:50 +02:00
tycho b9efa02c80 Initial implementation of IniFile overloading 2015-05-16 10:46:51 +01:00
Tiger Wang c10e83c02d Fixed creative click-outside
* Fixes #1995
2015-05-11 23:21:46 +01:00
Mattes D 846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
tycho 448df85e56 Added support for additional data in the ParticleEffect Packet
Also started refactoring how broadcasts are handled
2015-05-07 03:47:46 +01:00
Mattes D 9ba7823252 Merge pull request #1938 from jan64/master
Change visual protocol name to include MCServer
2015-05-04 23:28:49 +02:00
jan64 b1efaa55cd Change visual protocol name to include MCServer 2015-05-04 17:52:46 +02:00
Tiger Wang a509cf00ef Entity improvements
•Pathfinder improvements
•Fixes #1217
•Fixes #1933

Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
2015-05-03 23:58:12 +01:00
wiseoldman95 231ba3af53 Updated MC versions in ProtocolRecognizer.h 2015-04-28 09:16:09 +03:00
Mattes D c0bd482448 Protocol 1.8: Limit the amount of displayed data on NBT parse failure. 2015-04-20 08:35:32 +02:00
Tiger Wang 15afff1eab Fixed arm swing animation
* Fixes #1861
2015-04-17 15:33:40 +01:00
Scott Moore 8c144207dc Implement backend for /title command 2015-04-13 16:22:51 +10:00
Mattes D b913c5da69 Added VarInt64, normalized cPacketizer datatype names. 2015-03-22 23:09:23 +01:00
Mattes D c626848393 Unified cPacketizer across all protocols. 2015-03-22 19:46:08 +01:00
Mattes D c3c29577a5 Fixed signedness warnings in Protocol. 2015-03-21 16:11:57 +01:00
Mattes D 3923e3e37a Fixed signedness issues in protocols. 2015-03-21 15:40:56 +01:00
Mattes D b1d4b3bb96 Unified cByteBuffer types.
cByteBuffer now reads and writes any of the [U]Int<N> types.
2015-03-21 13:00:20 +01:00
Mattes D 0add3d4617 Merge pull request #1810 from mc-server/paintings
Paintings
2015-03-15 14:30:23 +01:00
Mattes D 65d2ef32e9 Merge pull request #1734 from mc-server/pistons
Handle client 'leave bed' request
2015-03-14 22:44:04 +01:00
Tiger Wang 3d398baf35 cPainting saving implemented
Additionally, it now inherits from cHangingEntity.
2015-03-13 23:05:06 +00:00
Mattes D c286b186c4 1.8 Protocol: Fixed a possible race condition.
Fixes #1759.
2015-02-24 10:04:43 +01:00
Tiger Wang 3869f76cc2 Handle client 'leave bed' request
* Fixes #1728
2015-02-08 21:21:48 +00:00
Mattes D 1ce9164694 Protocol 1.7: Fixed Coverity issues.
Fixes CID 66411, CID 103166 and CID 103167.
2015-02-08 14:49:46 +01:00
Howaner 9b9ce6fa3b Added IsOnGround() to cEntity 2015-02-07 10:45:45 +01:00
Mattes D 1b9c0f1030 Removed cFile::ReplaceFileNameInvalidChars().
Its only usage in cProtocol18 has been changed to a simple string replace - only the IPv6's colons were causing problems.
2015-01-27 14:53:34 +01:00
Mattes D 978fc6a988 Protocol18: Fixed failure with invalig logfile names. 2015-01-27 14:53:30 +01:00
Mattes D 5ac3a23586 Fixed warnings in 1.7 protocol. 2015-01-18 22:43:35 +01:00
Mattes D 7d13a2a77a Fixed Linux compilation. 2015-01-03 22:39:55 +01:00
Mattes D 06c2669cf6 Protocols: Ignore garbage data at the end of PluginMessage packets.
Fixes #1692.
2015-01-03 22:24:15 +01:00
Mattes D ccdf03daaf Refactored all player block placing to go through hooks.
Fixes #1618.
2014-12-24 07:20:17 +01:00
Mattes D d4c3821eca Fixed coverity issues in protocols.
Fixes CID 73099, CID 66411.
2014-12-21 20:01:42 +01:00
Mattes D 2bd03ee1f9 cMojangAPI: Fixed a possible problem with thread termination order. 2014-12-07 21:38:28 +01:00
Howaner 473cb6e0b2 Removed unused imports. 2014-11-29 15:22:24 +01:00
Howaner 2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
Howaner 8b028c5c78 Finished mob spawner implementation. 2014-11-18 15:33:41 +01:00
Howaner 42120e2ea5 Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Mattes D 190d34e2f7 Merge pull request #1565 from mc-server/MergedIniFile
Merged ini file
2014-10-24 09:13:39 +02:00
Mattes D 449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Howaner 72bb299a4a Merge branch 'master' into ChunkLoader
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
2014-10-23 14:59:42 +02:00
Tiger Wang a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D a42fa071bc Properly exported cItemFrame and cHangingEntity to Lua. 2014-10-21 22:02:30 +02:00
Howaner 44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang 2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Mattes D 687752241f cMojangAPI: Don't update data if server is in offline mode. 2014-10-17 13:57:18 +02:00
Howaner a59f2d15fb Merge branch 'master' into ChunkLoader 2014-10-06 17:38:42 +02:00
Mattes D 3d2d8a096b cMojangAPI: Added periodical refreshes. 2014-10-06 10:05:02 +02:00
Mattes D a8aeceab9d cClientHandle: Added protocol version knowledge. 2014-10-05 20:19:21 +02:00
Tiger Wang b5a2c6667a Improved furnaces
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
Howaner 382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
madmaxoft e74510bddf Fixed a missing semicolon. 2014-09-30 20:27:20 +02:00
madmaxoft d7066f43d3 Rewritten plugin messages, vanilla are being parsed directly.
This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
2014-09-30 13:33:57 +02:00
madmaxoft aae90c2cf0 Style fixes. 2014-09-29 21:38:11 +02:00
madmaxoft 280831df26 Plugin messages: Vanilla prefixes its payloads with VarInt lengths. 2014-09-28 23:03:44 +02:00
madmaxoft 488c6159df Revert "1.8: Fixed plugin messages."
This reverts commit 04ee8c43dd.
2014-09-28 22:27:23 +02:00
madmaxoft f8c627141a Protocol 1.8: Fixed possible crash on malformed packet. 2014-09-28 22:25:48 +02:00
Mattes D 8d55cd409e Merge pull request #1466 from mc-server/endofsupport
Removed protocols 1.2 to 1.6
2014-09-28 22:04:30 +02:00
Tiger Wang ae36ba5d33 Compilation fix 2014-09-28 13:08:00 +01:00
Howaner 04ee8c43dd 1.8: Fixed plugin messages. 2014-09-27 23:22:26 +02:00
Tiger Wang 1f8ee70d55 Bug fix 2014-09-27 22:13:37 +01:00
Tiger Wang 72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Howaner 033d16babb Merge branch 'master' into MobSpawner
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
Howaner af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Howaner d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
worktycho 411c69b420 Merge pull request #1419 from mc-server/redstoneTests
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
madmaxoft 976c6bd32b Protocol 1.8: Fixed plugin message packet. 2014-09-25 21:33:20 +02:00
madmaxoft 8f4cc27e39 Added cByteBuffer::WriteBEUShort(). 2014-09-25 20:47:29 +02:00
Mattes D e751f4ffe3 Merge pull request #1452 from Howaner/Fixes
Fixes
2014-09-25 20:45:54 +02:00
madmaxoft 27187371eb Protocol 1.8: Handling packet compression properly.
The compression didn't work with CommLog turned on.
2014-09-25 20:34:49 +02:00
madmaxoft 3459bc1ede Protocol 1.8: Added checks for values presence.
Reported by @worktycho / Coverity.
2014-09-25 19:42:35 +02:00
Howaner dd423a2467 Merge branch 'master' into Fixes 2014-09-25 19:22:46 +02:00
Tycho b2f5ab9678 Merge branch 'master' into redstoneTests
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-25 17:58:12 +01:00
Howaner 12621e3800 Use the json writer to write sign texts.
Without this change the client disconnects if the text contains "
2014-09-25 18:49:55 +02:00
madmaxoft aeabc4ff6b 1.8 Protocol: Fixed problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft a518a83c25 1.7 Protocol: fixed potential problems with no-payload packets. 2014-09-25 18:36:10 +02:00
Tycho 9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
madmaxoft d04ab9b703 Fixed compiler warnings in 1.8 protocol. 2014-09-23 22:12:48 +02:00
Howaner 4b38e077cf Merge branch 'master' into EntityCustomName
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
2014-09-23 14:39:49 +02:00
Howaner 1aa64f32e1 Updated README.md 2014-09-22 22:07:58 +02:00
Howaner fc11818f4c Hotfixed 1.8 item reading. 2014-09-22 22:06:08 +02:00
Howaner 9cddffb6df Changed metadata reading again. 2014-09-22 21:18:13 +02:00
Howaner bcb11078e3 Fixed item nbt reading. 2014-09-22 17:15:08 +02:00
Howaner 718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
Howaner 6aa331a4fa Code improvements. 2014-09-19 15:07:01 +02:00
Howaner 4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner 43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
Howaner be6d4a5912 1.8: Simplified item metadata reading. 2014-09-18 16:04:03 +02:00
madmaxoft 16e9deba8d Added an explicit setting for allowing BungeeCord handshake. 2014-09-17 20:56:33 +02:00
Tycho 045d54e0e2 Merge branch 'master' into redstoneTests
Conflicts:
	src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho 6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
madmaxoft 82317709f8 Full BungeeCord compatibility.
Fixes #1392.
Fixes SpigotMC/BungeeCord#1211.
2014-09-17 11:07:42 +02:00
madmaxoft 3406957f1b Initial BungeeCord support.
Ref.: #1392
2014-09-17 09:38:06 +02:00
Howaner 63142a7eb1 Simplified WriteUUID() 2014-09-14 20:08:18 +02:00
Howaner 382a42b3d6 Fixed warnings. 2014-09-14 14:24:28 +02:00
Howaner 94d562502d 1.8: Updated scoreboard packets. 2014-09-13 21:48:16 +02:00
Howaner f323955099 Moved chat json creating to the CompositeChat class. 2014-09-13 20:27:10 +02:00
Howaner b462416e1f 1.8: Fixed maps. 2014-09-13 02:20:04 +02:00
Howaner 69afc4dbba Merge branch 'master' into 1.8-Protocol
Conflicts:
	src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
Howaner d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner 0d34fc9f31 Fixed wrong buffer length in the 1.8 protocol. 2014-09-12 13:01:23 +02:00
Howaner 34bcd3dd58 1.8: Fixed ReadItem() 2014-09-12 02:42:04 +02:00
Howaner eb19eff5ac 1.8: Added difficulty sending 2014-09-12 02:00:28 +02:00
Howaner 8151c79a87 1.8: Fixed block entities. 2014-09-12 01:44:20 +02:00
Howaner 85ec697d32 1.8: Fixed workbench, enchanting and anvil window. 2014-09-12 01:15:21 +02:00
Howaner e10237fb4d 1.8: Enderman, byte -> short 2014-09-12 00:41:07 +02:00
Howaner a02d96d1f5 1.8: Fixed enderman spawning. 2014-09-12 00:36:46 +02:00
Howaner c7044fa1dd 1.8: Fixed inventory open packet. 2014-09-11 23:17:27 +02:00
Howaner 6d5a5eb665 Removed GetProtocolVersion() from the protocols. 2014-09-11 22:27:35 +02:00
Howaner d815aeaefd 1.8: Fixed sign placing. 2014-09-11 22:21:53 +02:00
Howaner c45bf7cf55 1.8: Fixed hangings. 2014-09-11 20:06:28 +02:00
Howaner 3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Howaner 71c3369e08 1.8: Added MultiBlockChange packet. 2014-09-09 18:27:31 +02:00
Howaner f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Howaner 6fb0a76b1e Merge branch 'master' into 1.8-Protocol 2014-09-09 01:55:21 +02:00
Howaner d1d4f2146e PlayerSpawn packet: Send the correct uuid. 2014-09-09 01:54:40 +02:00
Howaner 4b1f4e8d7e 1.8: Added new uuid field. 2014-09-09 01:52:51 +02:00
Howaner 76fa3a7ccd More fixes. 2014-09-08 20:12:43 +02:00
Howaner e740739d04 Recoded cProtocol180 class. 2014-09-08 19:24:33 +02:00
Howaner fa2b69b3f3 1.8: Fixed tab complete. 2014-09-08 17:08:28 +02:00
Howaner 8f8693a71e Fixed more 1.8 packets. 2014-09-08 17:02:54 +02:00
Howaner 38124bcce3 Updated chunk sending to 1.8 2014-09-08 12:24:06 +02:00
Howaner 10a30a03e3 Added GetProtocolVersion() to cProtocol. 2014-09-08 11:35:21 +02:00
Howaner 09ff17b71e Implemented packet compression.
ChunkData packet needs this.
2014-09-08 00:36:30 +02:00
Mattes D 0a651b9fd8 Added Y-wise asserts to signs.
This should help detect #1313's second case.
2014-09-06 18:59:17 +02:00
Mattes D 868723ce50 Alpha-sorted protocol 1.7 senders. 2014-09-06 18:57:57 +02:00
Howaner da28c70def Fixed client errors. 2014-09-04 19:03:21 +02:00
Howaner 07fba5c98e Added more 1.8 protocol things. 2014-09-04 03:22:35 +02:00
Howaner 157f1c6688 Started implementing of the 1.8 protocol. 2014-09-04 00:29:36 +02:00
Howaner 42dcd534df Merge branch 'master' into EntityCustomName 2014-09-02 19:36:14 +02:00
Howaner 1bb4d79412 Added SetCustomName() to players. 2014-09-02 19:12:35 +02:00
Howaner 7c4cb9a385 Added CustomName to cMonster. 2014-09-01 20:12:56 +02:00
worktycho de30a8c8c6 Make sure packets are valid
Fixes CID 66408, 66409 and 72045
2014-09-01 18:18:07 +01:00
worktycho b6d77d9679 Init RankMgr pointer to NULL 2014-08-31 20:26:08 +01:00
Mattes D be32c0527c Merge pull request #1290 from mc-server/Ranks
Rewriting permission system to use UUIDs and Ranks
2014-08-26 15:23:21 +03:00
Mattes D bf16c5ed92 Type warning fixes. 2014-08-25 18:25:39 +03:00
Mattes D 8f20c359cd Fixed a type warning. 2014-08-25 07:28:45 +02:00
Mattes D e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Mattes D d471ee8a9d Fixed 1.7.2 login packet reading.
Fixes #1317.
2014-08-21 21:38:57 +02:00
Mattes D 0c04bf962e cMojangAPI updates cRankManager's playernames. 2014-08-21 20:47:52 +02:00
Mattes D 936604ca95 cMojangAPI: Fixed MakeUUID___() bindings.
ToLua would generate a shadow return value for the input strings.
2014-08-21 15:19:30 +02:00
STRWarrior 3a113e3a75 Merge pull request #1339 from mc-server/Hooks
Added HOOK_SERVER_PING
2014-08-20 22:57:48 +02:00
Howaner 4da61e67d7 Renamed a_Motd to a_ServerDescription. 2014-08-20 22:22:38 +02:00
Howaner cf5ab14ca5 Added a_ClientHandle to the HOOK_SERVER_PING hook. 2014-08-20 22:19:50 +02:00
Howaner cfdf39a75f Added "HOOK_SERVER_PING" call to older protocols 2014-08-20 16:12:05 +02:00
Howaner 2cca4d70c8 Cleaned up code. 2014-08-20 16:04:18 +02:00
Howaner 228dd61995 Added HOOK_SERVER_PING 2014-08-20 16:01:30 +02:00
Franz Reiter 8f0c4911f7 Merge pull request #1296 from mc-server/LuaAPI
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
2014-08-12 16:05:33 +02:00
madmaxoft 0a52ed6eb9 cProtocol172: Check return values.
Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431
2014-08-11 15:33:20 +02:00
Howaner 47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
archshift 92f67789fc Gave names to unnamed enums 2014-08-10 15:06:59 -07:00
madmaxoft 9113b45673 MojangAPI: Fixed PlayerNameToUUID(). 2014-08-04 23:35:50 +02:00
Howaner f5b71cc1f8 Fixed #1286 2014-08-04 20:16:52 +02:00
Mattes D 7b986e65d2 Merge pull request #1285 from mc-server/StrCaseRefactor
Refactored case-conversion functions.
2014-08-04 12:02:57 +02:00
madmaxoft 1fa210c7f9 Refactored case-conversion functions.
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
2014-08-04 11:30:20 +02:00
Howaner 8cdcfcceb3 Changed properties for-loop. 2014-08-04 11:26:31 +02:00
Howaner 977a9948b9 Fixed skins in mc 1.7.9/1.7.10 2014-08-03 22:15:26 +02:00
madmaxoft 21f52676f3 cMojangAPI: Added UUID-to-Name lookup.
Also fixed the bindings, now all functions are static-like.
2014-08-03 22:04:51 +02:00
madmaxoft 003f18bd0f Added cMojangAPI:GetUUIDFromPlayerName().
This is a simpler way to ask for a single name -> uuid conversion.
2014-08-03 22:04:50 +02:00
Mattes D 941a182d8a Merge pull request #1255 from mc-server/NameToUUID
Name to UUID
2014-08-01 22:35:12 +02:00
madmaxoft 6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft 70fd7caf1f Removed trailing whitespace. 2014-07-31 22:54:45 +02:00
madmaxoft 59adf113f0 MojangAPI: Moved the settings to a separate ini section. 2014-07-31 17:22:48 +02:00
Howaner 556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
madmaxoft 8b519bf6e2 MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). 2014-07-31 10:02:50 +02:00
Howaner 89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
madmaxoft 0336e12cee MojangAPI: Renamed cache file to MojangAPI.sqlite. 2014-07-30 17:09:41 +02:00
madmaxoft 85d64d291a MojangAPI: Clarified the UUID conversion code. 2014-07-30 14:09:30 +02:00
madmaxoft 17a94b16ea MojangAPI: Implemented UUID shortening and dashing. 2014-07-30 13:56:30 +02:00
madmaxoft 6476bd0e2e Exported cMojangAPI to Lua. 2014-07-30 13:56:29 +02:00
madmaxoft 4dd858f899 Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.
The cache is persisted into a SQLite DB file on server shutdown.
2014-07-30 13:56:29 +02:00
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
madmaxoft f5f9656917 cAuthenticator: Added GetUUIDsFromPlayerNames(). 2014-07-28 12:37:48 +02:00
archshift 4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
Tiger Wang 3385ed56b8 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
2014-07-22 10:24:28 +01:00
madmaxoft 93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft 6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
archshift 52add840cf Fixed attempts to call c_str on ChatColors 2014-07-19 11:15:21 -07:00
madmaxoft 08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
madmaxoft 1cb26bda8e Fixed spaces after commas in protocol data.
The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
2014-07-19 15:07:28 +02:00
madmaxoft 00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Mattes D 4293db5eae Merge pull request #1214 from mc-server/anti-glob
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
archshift f94cf49980 Authenticator.cpp: Killed a global destructor warning 2014-07-18 21:38:55 -07:00
archshift 725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift 15aacc24a5 Protocol/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
Tiger Wang 719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang 37140ae578 Merge branch 'master' into portals
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
2014-07-18 20:10:51 +01:00
archshift 33b0a719da ProtocolRecognizer.cpp: removed unused NumBytesRead 2014-07-17 18:39:44 -07:00
madmaxoft c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft 2423fbf2ef Normalized comments.
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
Mattes D e444106d09 Merge pull request #1192 from mc-server/skinuuid
Skins
2014-07-16 13:30:57 +02:00