Mattes D
351e925e3d
Merge pull request #633 from mc-server/More_Sideways_Blocks
...
More sideways blocks.
2014-02-03 14:01:22 -08:00
STRWarrior
70e48960ac
Named the different quartz block.
2014-02-03 22:30:32 +01:00
Tiger Wang
a3759c1462
Merge remote-tracking branch 'origin/master' into playerimprovements
2014-02-03 21:25:42 +00:00
Tiger Wang
3fc848c95a
Fixed #626
...
* Fixed consumption of carrots and potatoes
2014-02-03 21:16:26 +00:00
Tiger Wang
6bbba2644d
Fixed issues with farmland
...
* Fixed farmland reversion checks not taking into account carrots and
potatoes
* Fixed #623
2014-02-03 21:14:52 +00:00
Tiger Wang
b5e898a608
Server now handles join messages also
...
* Revised as well hook documentation
2014-02-03 21:12:44 +00:00
Tycho
4b19247305
Fogot to save Biogen
2014-02-03 13:07:38 -08:00
Tycho
d9fb83300c
Fixed Compile errors
...
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03 13:01:12 -08:00
Tycho
f8881622a4
Removed unused lookups
2014-02-03 12:31:18 -08:00
Tycho
80807eec2c
Increased Type safety of Biomes
...
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
tonibm19
df8b589b31
Not exporting FindClosestPlayer
2014-02-03 21:06:43 +01:00
tonibm19
defb001ad7
Fixed compilation
2014-02-03 21:05:10 +01:00
tonibm19
c2e7dd34d9
Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-03 20:52:11 +01:00
STRWarrior
347488a9a2
Fixed some issues.
...
Meta wasn't set if the block wasn't a pillar.
Fixed typo.
2014-02-03 20:34:05 +01:00
STRWarrior
0c29c52ff3
Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks.
2014-02-03 20:22:45 +01:00
STRWarrior
5ba46ebc21
This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars.
2014-02-03 20:08:38 +01:00
Mattes D
2450d0467f
Merge pull request #623 from mc-server/tnt
...
TNT improvements
2014-02-03 10:55:23 -08:00
madmaxoft
c9916cd8c2
Fixed socket leaking.
2014-02-03 17:07:46 +01:00
Tiger Wang
e3b9cdebc9
Inversed condition
2014-02-03 14:01:47 +00:00
madmaxoft
0b384198e5
SocketThreads: Fixed sending to closed socket.
2014-02-03 10:39:10 +01:00
madmaxoft
c2c1639af8
Groups.ini can contain spaces around commas in values.
...
This includes Permissions, Inherits and Commands.
Also fixed an unlikely but possible crash with group colors.
2014-02-03 10:39:09 +01:00
Mattes D
b090547c17
Merge pull request #602 from mc-server/improvementsandfixes
...
Redstone crash fix and current console line replace function
2014-02-02 22:02:25 -08:00
Tiger Wang
c1c7936c68
Fixed multiple invalid permission nodes
...
New players can build as default now
2014-02-02 22:55:41 +00:00
Tiger Wang
2d0b31e7b6
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-02-02 22:09:03 +00:00
Tiger Wang
ac03c51997
Fixed #624
2014-02-02 22:08:57 +00:00
Tiger Wang
0f67f80c6e
Added IsBlockWaterOrIce()
2014-02-02 21:48:21 +00:00
Tiger Wang
ba398c06d7
Uncommented pickup spawner code
2014-02-02 21:24:06 +00:00
Tiger Wang
d9a9052de7
Revert "Added LOGREPLACELINE for line replacement"
...
This reverts commit 7d03876a3e
2014-02-02 20:10:31 +00:00
Tiger Wang
6ef5c057aa
Revert "Improved code"
...
This reverts commit d8aa0b0ec7
2014-02-02 20:10:23 +00:00
Tiger Wang
f4c25ac445
Revert "Added a comment"
...
This reverts commit 7ae5631d89
2014-02-02 20:10:13 +00:00
Tiger Wang
ecbb9134a5
Revert "Properly initialised variables"
...
This reverts commit 02e7527893
2014-02-02 20:10:02 +00:00
Tiger Wang
dd3cc733ae
Revert "Fixed issues with insufficient console space"
...
This reverts commit 6b18add09b
2014-02-02 20:09:56 +00:00
Tiger Wang
e4b666989d
Revert "A newline issue is resolved"
...
This reverts commit 397208145e
2014-02-02 20:09:47 +00:00
Tiger Wang
070962fb8a
Revert "Fixed Linux compile"
...
This reverts commit 5becfe850a
2014-02-02 20:09:40 +00:00
Tiger Wang
a0242afec2
Revert "Another Linux fix"
...
This reverts commit 6f660b379e
2014-02-02 20:09:35 +00:00
Tiger Wang
5bf060f06c
Revert "Again improved LogReplaceLine"
...
This reverts commit dd325d742d
2014-02-02 20:09:15 +00:00
Tiger Wang
e56d41175b
TNT improvements
...
+ Added entity damage
+ Added entity propulsion
* Fixed #67 and fixed #230
2014-02-02 19:16:38 +00:00
Tiger Wang
55cfb232db
Possibly fixed #618
2014-02-02 19:10:22 +00:00
Tycho
1e4e6c4619
Merge branch 'master' into registerfix
2014-02-02 09:11:53 -08:00
madmaxoft
c3d4cc4f4f
Fixed dark oak and acacia placement.
...
Fixes #621 .
2014-02-02 17:52:05 +01:00
Tycho
42497847ac
Added missing files
2014-02-02 06:59:36 -08:00
Tycho
0b0aa5554f
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockTorch.h
2014-02-02 06:56:07 -08:00
Tycho
b82fc394dd
Changed Signiture of OnUpdate
2014-02-02 06:49:37 -08:00
Tiger Wang
b89419f603
Creative players take Plugin damage
2014-02-02 12:47:17 +00:00
Tiger Wang
275035eb70
Fixed #620
2014-02-02 12:43:57 +00:00
Kirill Kirilenko
a134fd45cf
Added saving of angry flag.
2014-02-02 14:28:42 +04:00
Kirill Kirilenko
a1c36c18e0
Fixed sitting tag.
2014-02-02 13:56:55 +04:00
Tiger Wang
dd325d742d
Again improved LogReplaceLine
...
* Fixed issues on Linux with cursor positioning
* Made preprocessor blocks more readable
* Improved reliability of line clearing on Windows
- Removed an *unneeded* variable
2014-02-01 21:44:23 +00:00
Tiger Wang
e26dc5cc0a
Added checks for ice into IsBlockWater()
...
* This fixes players spawning in vast oceans of ice, as opposed to the
previous water
2014-02-01 21:40:50 +00:00
Tiger Wang
b0784d1931
Split cCoord template into one and two data types
2014-02-01 21:40:02 +00:00
Kirill Kirilenko
2a52b390c0
Monster's nominal speed was increased.
2014-02-01 20:38:53 +04:00
Tycho
6e39ed3868
Changed Signiture of OnDigging
2014-02-01 08:35:48 -08:00
Kirill Kirilenko
0d33f2d11d
Fixed teleport to air, if owner is flying.
2014-02-01 20:22:12 +04:00
Kirill Kirilenko
0259aed8be
Added saving of collar's color.
2014-02-01 20:16:42 +04:00
Tycho
cf3b4ec226
Changed Signiture of OnDestroyedByPlayer
2014-02-01 06:01:13 -08:00
Tycho
4b5bd4dedf
Removed register keyword from Messinne Twister
...
Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy
2014-02-01 05:14:31 -08:00
Mattes D
33759197e9
Merge pull request #585 from daniel0916/hooks
...
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
Tycho
c6304b2b4f
Changed pointers to references
2014-02-01 05:06:32 -08:00
daniel0916
dbbd47b96d
Removed "player destroying" hook
2014-02-01 13:27:44 +01:00
Tiger Wang
6f660b379e
Another Linux fix
2014-02-01 01:54:26 +00:00
Tiger Wang
5becfe850a
Fixed Linux compile
2014-02-01 01:47:21 +00:00
Tycho
fec17409d2
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/World.h
2014-01-31 15:31:05 -08:00
Tiger Wang
397208145e
A newline issue is resolved
2014-01-31 23:25:15 +00:00
Tycho
25ec7750aa
Changed signitures of Several BLockHandler Methods
...
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
2014-01-31 15:17:41 -08:00
Tiger Wang
6b18add09b
Fixed issues with insufficient console space
2014-01-31 23:02:26 +00:00
Tiger Wang
02e7527893
Properly initialised variables
2014-01-31 20:50:29 +00:00
Kirill Kirilenko
8180b643ff
Added reading saved state of the wolf (sitting or standing).
2014-01-31 21:34:00 +04:00
Mattes D
617c5b1fff
Merge pull request #607 from mc-server/Wolf_Owner_Saving
...
Wolf: Their owner now gets saved.
2014-01-31 07:32:38 -08:00
STRWarrior
19e5122b77
Inversed condition.
2014-01-31 16:31:55 +01:00
STRWarrior
c7e4ade7c3
Wolf: If Owner tag is missing a normal ownerless wolf will spawn.
2014-01-31 16:27:21 +01:00
madmaxoft
882d108622
Fixed cLineBlockTracer:Trace() signature.
2014-01-31 16:01:16 +01:00
madmaxoft
5092ae5266
Added cPluginManager:BindCommand() form to the API.
...
That's the canonical way to call static functions.
2014-01-31 16:01:15 +01:00
madmaxoft
66427d754b
Added cChunkDest::UpdateHeightmap()
...
This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator.
2014-01-31 16:01:15 +01:00
Tiger Wang
7ae5631d89
Added a comment
2014-01-31 00:05:23 +00:00
Tiger Wang
d8aa0b0ec7
Improved code
...
* Fixed some issues
* Fixed standard violation
2014-01-31 00:04:57 +00:00
STRWarrior
550a09020d
Fixed bad variable.
2014-01-30 21:49:39 +01:00
STRWarrior
1a361be44f
Check if the tag is found.
2014-01-30 21:46:45 +01:00
STRWarrior
419778a306
Fixes #606
2014-01-30 21:39:31 +01:00
tonibm19
16a939a757
Attempt at implementing #563
...
Not tested (I don't have RasPi)
2014-01-30 18:02:37 +01:00
madmaxoft
b61a74d6a2
Lua: Fixed an error in table-functions callbacks.
2014-01-29 22:56:38 +01:00
Tiger Wang
7d03876a3e
Added LOGREPLACELINE for line replacement
2014-01-29 19:22:03 +00:00
Tiger Wang
ed7816419d
Fixed redstone simulator crash found in #570
2014-01-29 19:19:14 +00:00
tonibm19
e9c1d1ea9c
Did what xoft said
2014-01-29 20:02:41 +01:00
tonibm19
1c1832b6ce
Rewritten code.
...
Implemented xoft suggestion.
Using MoveToPosition as tigerw suggested.
2014-01-29 19:15:26 +01:00
tonibm19
ba4865f7ee
Fixed sheep
2014-01-29 18:32:46 +01:00
tonibm19
73d9a285d5
Fixed a copypasta error...
2014-01-29 18:25:10 +01:00
tonibm19
ebe0f9372f
Now mobs follow you when holding their breed item
2014-01-29 18:08:33 +01:00
madmaxoft
04107fa85d
Limited sign lines to 15 chars.
...
Fixes #598 .
2014-01-29 17:59:49 +01:00
madmaxoft
e40c5a20c8
Plugin files are loaded in alphabetical order.
...
Except for the Info.lua file which gets loaded always last. Implements #597 .
2014-01-29 17:48:04 +01:00
STRWarrior
5e3f7947ae
Removed debug message when a firework entity hit a solid block.
2014-01-29 13:28:08 +01:00
STRWarrior
374034e615
Bottle o' Enchanting spawns an experience orb.
2014-01-29 13:27:03 +01:00
madmaxoft
789cf63740
Added 1.7.4 to the list of supported protocols.
2014-01-29 12:16:27 +01:00
madmaxoft
3bbca8c291
Protocol 1.7: Encryption is enabled only with auth.
2014-01-29 09:56:31 +01:00
madmaxoft
bc6fc859f4
Protocol 1.7: Forced encryption on all connections.
...
This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
2014-01-28 23:53:54 +01:00
madmaxoft
9de52252ac
Crypto: Added public key encryption / decryption.
2014-01-28 23:53:54 +01:00
madmaxoft
f7cbb07b54
Fixed an error in Crypto.
2014-01-28 23:53:53 +01:00
Mattes D
3390607ee5
Merge pull request #594 from mc-server/Villager_Update
...
Villager update
2014-01-28 07:32:01 -08:00
madmaxoft
76457d3673
Fixed timing on *nix.
2014-01-28 16:28:55 +01:00
STRWarrior
8ca98e0c0e
Renamed Farmer functions and added doxycomments
2014-01-28 16:26:44 +01:00
STRWarrior
b2bacf3a25
Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere.
2014-01-28 15:40:13 +01:00
madmaxoft
81837edb22
Fixed a slight bug in RSA encryption code.
2014-01-28 09:50:48 +01:00
Mattes D
5f9228bac8
Merge pull request #595 from mc-server/NonBlockingSockets
...
Non blocking sockets
2014-01-27 21:43:59 -08:00
STRWarrior
807a4dba98
Villager doesn't check the environment for crops if it doesn't need to.
2014-01-27 22:04:24 +01:00
STRWarrior
babc80ed77
The world can now be configured wether farmers should be able to harvest crops.
2014-01-27 22:02:19 +01:00
STRWarrior
8bf9043f98
Villager: Few more comments.
2014-01-27 21:39:00 +01:00
madmaxoft
a359275064
Squashed common code.
2014-01-27 21:34:54 +01:00
STRWarrior
33ad2761a0
Cleanup
...
Most code in Tick is now split up in different functions.
2014-01-27 21:34:22 +01:00
madmaxoft
4169af1ce1
Fixed Linux compilation.
2014-01-27 21:33:06 +01:00
madmaxoft
cc1284a753
Rewritten networking to use non-blocking sockets.
...
This fixes #592 .
2014-01-27 21:27:13 +01:00
STRWarrior
723bb78dd1
Villagers: Harvesting is more rare.
2014-01-27 20:52:42 +01:00
STRWarrior
5b983b72fa
Villager: Farmers can't place crops on blocks other then farmland.
2014-01-27 20:44:18 +01:00
Tiger Wang
fc9e527830
SIGABRT exits with failure.
2014-01-27 18:57:26 +00:00
STRWarrior
9cf006ecea
Fixed compiler error.
2014-01-27 19:06:50 +01:00
STRWarrior
3dbe6c6de9
Villager: Farmer: Crops finding is more random.
2014-01-27 18:58:09 +01:00
STRWarrior
9807056a9c
Added GetCropsPos and DidFindCrops functions.
2014-01-27 18:33:57 +01:00
STRWarrior
06c3bc1ea5
Villagers: Farmers now replant the crops.
2014-01-27 18:27:57 +01:00
STRWarrior
2cdd8f1961
Villagers: Fixed only gettings the crops block when farming.
2014-01-27 17:30:18 +01:00
STRWarrior
ca12decaf6
Villagers don't look for new crops when they already found one.
...
Slight cleanup.
2014-01-27 17:20:39 +01:00
STRWarrior
89a620ca54
E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them.
2014-01-27 17:19:13 +01:00
STRWarrior
969bf05a26
Villagers: Farmers can also harvest carrots and potatoes.
2014-01-27 15:44:55 +01:00
STRWarrior
ed95f4d81b
Makes farmers farm crops.
2014-01-27 14:40:31 +01:00
madmaxoft
30c431b479
Fixed client packet parsing.
...
When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541 .
Also modified comm logging, now each direction can be turned on separately.
2014-01-26 17:56:12 +01:00
madmaxoft
ab4672be40
cByteBuffer has more self-tests.
2014-01-26 17:56:12 +01:00
madmaxoft
61848ff5a0
Item-loading now checks for weird bytes.
2014-01-26 17:56:11 +01:00
madmaxoft
a3ac1be7b7
Fixed Byte-order reading.
...
The functions would fail on bytes that were above 127.
2014-01-26 17:56:11 +01:00
Tiger Wang
ea9de4bbb7
Added SIGABRT to catchers list
2014-01-26 16:15:05 +00:00
Tycho
6e6409b1a0
Removed cWorld Include
2014-01-26 07:10:29 -08:00
Tycho
a13d009a30
Refactored GetPlacementBlockTypeMeta
2014-01-26 07:06:25 -08:00
Tycho
bed2ee22e8
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockRail.h
src/World.h
2014-01-26 06:28:51 -08:00
Tycho
14e48ccb4b
Refactored cBlockHandler::OnUse and dependents
2014-01-26 06:20:39 -08:00
Mattes D
09ee8a1bb6
Merge pull request #589 from mc-server/minecartimprovements
...
Minecart improvements
2014-01-26 05:13:54 -08:00
Mattes D
1f4e12c50c
Merge pull request #590 from mc-server/Wolf_Fix
...
Wolf: Small fix since the new AI and a new small feature.
2014-01-26 04:40:16 -08:00
STRWarrior
4c780e7b44
Fixed bug where wolfs would teleport while they were sitting.
2014-01-26 13:27:35 +01:00
STRWarrior
a533386144
Small fix since the new AI and a new small feature.
...
You get particles when trying to tame wolfs.
They don't walk anymore when they are sitting.
2014-01-26 13:07:21 +01:00
Tiger Wang
70113b5730
Fixed segmentation fault on villager damage
...
It occurred when attack was environmental.
2014-01-26 00:14:00 +00:00
Tiger Wang
52f7467fe1
Reduced unnecessary echoes (thanks xoft)
2014-01-25 23:48:48 +00:00
Tycho
a2d3eea80b
Added support for overide in c++11 supporting varients of gcc/clang
2014-01-25 15:02:31 -08:00
Mattes D
f78a62a5e3
Merge pull request #575 from worktycho/GeneratingBenchmark
...
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
Mattes D
5749b40422
Merge pull request #588 from mc-server/Sheep_Eating
...
Implemented sheeps eating grass.
2014-01-25 13:36:47 -08:00
Mattes D
cdcad2237a
Merge pull request #587 from mc-server/mobimprovements
...
Mob improvements & rudimentary artificial intelligence
2014-01-25 13:36:32 -08:00
Tiger Wang
cdd6478cea
Did what xoft recommended
2014-01-25 21:29:27 +00:00
Mattes D
437a9c8d1f
Merge pull request #583 from mc-server/ChangeToPolarSSL
...
Change to polar ssl
2014-01-25 13:05:16 -08:00
Tiger Wang
398e159f5f
Rail speed tweak
2014-01-25 20:33:23 +00:00
STRWarrior
7b8dc01db3
Implemented sheeps eating grass.
2014-01-25 21:19:52 +01:00
Tiger Wang
1d0e1bdcb1
Improved AllToLua UI experience
2014-01-25 19:36:20 +00:00
Tycho
15b92af166
First attempt at Implementing Interfaces
2014-01-25 11:14:14 -08:00
Tiger Wang
6fa3a0cf70
Two minor changes
2014-01-25 19:05:44 +00:00
Tiger Wang
7468ba0f10
Implemented fall damage for mobs
...
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
2014-01-25 19:02:13 +00:00
Tiger Wang
60b7f5f23d
Attack() is no longer always called
2014-01-25 19:00:50 +00:00
Mattes D
c8be9b5b1a
Merge pull request #581 from worktycho/strerror
...
Switched cEvent to use strerror_r for error messages
2014-01-25 10:43:00 -08:00
Tycho
03b08456b6
dded dependecy on Blocks to Generator
2014-01-25 10:23:18 -08:00
madmaxoft
ca0e51d89c
Added RSA encryption to crypto wrappers.
2014-01-25 19:19:17 +01:00
Tycho
2a18feb015
Stupid Mistake fixed
2014-01-25 10:13:54 -08:00
Tiger Wang
d9707a9291
Implemented pickup combining
...
* Fixes FS393
* Part of #131
2014-01-25 15:19:56 +00:00
Tiger Wang
314fc3cdac
Mob bugfixes
...
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
2014-01-25 14:42:26 +00:00
madmaxoft
a2dfb28537
Merged branch 'master' into ChangeToPolarSSL.
2014-01-25 15:37:00 +01:00
madmaxoft
ff066453b8
Comm logging is available in both Debug and Release modes.
2014-01-25 15:28:16 +01:00
madmaxoft
5aa3fc4c56
Added cFile::Flush().
...
This is useful when using cFile as a log file and we know the server may crash after a specific write, so we flush the file before continuing.
2014-01-25 15:27:34 +01:00
Tycho
2806b48afa
Fixed exports
2014-01-25 06:06:30 -08:00
madmaxoft
96b4af1596
Protocol17: Comm logging shows the data left over from previous parse.
2014-01-25 15:06:30 +01:00
Tycho
977e277094
Switched cEvent to GetOSErrorString
2014-01-25 06:02:20 -08:00
Alexander Harkness
6b51c62d78
Merge pull request #586 from worktycho/BindingsMove
...
Implented xofts suggestions in #577
2014-01-25 05:53:01 -08:00
Tycho
59b8205f02
Extracted cSocket::GetErrorString into GetOSErrorString
2014-01-25 05:51:03 -08:00
Tycho
45bc1ff033
Added dependecy output to Bindings/BindingsDependencies.txt
2014-01-25 05:35:04 -08:00
Tycho
b2fd91ee6b
Reformatted Bindings Dependecies
2014-01-25 05:25:43 -08:00
daniel0916
bac750b24e
Added "player destroying" and "player destroyed" hooks
...
Hooks:
HOOK_PLAYER_DESTROYING
HOOK_PLAYER_DESTROYED
Idea from: https://github.com/mc-server/MCServer/issues/473
2014-01-25 11:25:22 +01:00
Tiger Wang
fd7fc7e59e
All mobs now drown ( fixes #54 )
...
* Implemented mob drowning
* Iron Golems and squids are excluded
2014-01-24 23:58:51 +00:00
Tiger Wang
1112f5adc6
Fixed a generator bug
2014-01-24 23:56:19 +00:00
Tiger Wang
b367a74d3e
Zombies and skeletons use AI
2014-01-24 23:56:05 +00:00
madmaxoft
ebcaaad63a
Fixed *nix compilation for previous commit.
2014-01-24 23:05:26 +01:00
madmaxoft
d0da5d392f
Added per-connection comm logging in debug mode.
...
It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter.
2014-01-24 23:03:48 +01:00
Tiger Wang
a988063915
Miscellaneous improvements
2014-01-24 21:55:04 +00:00
Tiger Wang
bf2af73899
Changed a condition to IsGameMode
2014-01-24 21:54:20 +00:00
madmaxoft
6c1d992eeb
Fixed a possible deadlock on client disconnect.
2014-01-24 22:23:58 +01:00
madmaxoft
f0a75f7f73
Fixed a failure in cSquid.
...
Probably due to rounding errors the squid was querying out-of-chunk coords.
2014-01-24 22:23:57 +01:00
Tiger Wang
0583b9df39
Made wolves compatible with new AI code
2014-01-24 20:46:47 +00:00
Tiger Wang
1f82b6e192
Monsters no longer check for direct line of sight
2014-01-24 20:46:22 +00:00
Tiger Wang
9c0e3615ce
Large reworking of mob code [SEE DESC]
...
+ Implemented better pathfinding
- Removed lots of unused variables, functions, etc.
* Changed some variable types
* Other miscellaneous fixes, and also completes the previous PRs
2014-01-24 19:57:32 +00:00
Tiger Wang
161a1c7274
Fixed mobs too close to player not ticking
...
A condition would never be fulfilled. A number squared was compared to
-1, but there is nothing that, multiplied by itself, gives -1.
2014-01-24 19:54:13 +00:00
Tiger Wang
3e675f8c38
Implemented creeper abilities
...
* Creepers now explode with a sound effect
* Creepers drop a music disc on the unlikely event of being killed by a
skeleton's arrow
Inspired by @maniak89's PR #132 .
2014-01-24 19:52:52 +00:00
Tiger Wang
2ce26574ef
Removed unused ReferenceManager
2014-01-24 19:46:45 +00:00
Tiger Wang
f39daabf7e
Added more minecart powered rail directions
2014-01-24 19:39:39 +00:00
madmaxoft
e75f979e01
Fixed Win nightbuilds not producing PDBs.
2014-01-24 10:24:24 +01:00
madmaxoft
0369c585fb
Fixed a few compile-time and runtime warnings in ScoreboardSerializer.
2014-01-24 09:58:40 +01:00
madmaxoft
b02940209d
Fixed crash with failed entity-loading.
...
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
2014-01-24 09:57:12 +01:00
madmaxoft
8a254faaf7
Merge remote-tracking branch 'MikeHunsinger/master'
2014-01-24 08:55:41 +01:00
madmaxoft
22d101034f
Fixed flint&steel failure on the Y world edges.
2014-01-24 08:53:49 +01:00
Mike Hunsinger
7c12247263
Fixed indentation once and for all.
2014-01-23 20:11:10 -07:00
Mike Hunsinger
9926ea58e8
Fixed indentation and doxygen comments... For real this time.
2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b
Fixed spacing and doxycomments.
2014-01-23 19:54:00 -07:00
madmaxoft
98976de071
Merge branch 'master' into ChangeToPolarSSL.
2014-01-23 23:46:51 +01:00
madmaxoft
e251e52673
Fixed a warning in ScoreboardSerializer.
2014-01-23 23:45:28 +01:00
madmaxoft
5f34c78091
PolarSSL is fully used for 1.3.2 protocol encryption.
2014-01-23 23:35:23 +01:00
Mattes D
0e10120fc7
Merge pull request #580 from xdot/master
...
Fixed scoreboard serialization
2014-01-23 13:37:20 -08:00
Tycho
b95e005d91
Make clean now effects Bindings
2014-01-23 11:06:42 -08:00
andrew
b21b682d85
Fixed 1.5.x scoreboard packet IDs
2014-01-23 21:06:05 +02:00
Tycho
ce2fb844aa
Removed Bindings folder subcmake on *nix
2014-01-23 11:03:49 -08:00
Tycho
27d1d5d491
Bugfixes
2014-01-23 11:00:36 -08:00
Tycho
e0956be0a7
added dependecies for bindings regen
2014-01-23 10:41:08 -08:00
Tycho
7419579140
Switched cEvent to use strerror_r for error messages
2014-01-23 10:25:56 -08:00
madmaxoft
9774da8122
Fixed a bug in LeakFinder.
2014-01-23 17:54:38 +01:00
madmaxoft
435eae3858
Fixed crash while calling disabled plugins.
2014-01-23 16:14:00 +01:00
andrew
5c04e216eb
Fixed scoreboard.dat structure
2014-01-23 16:42:01 +02:00
andrew
bafa0347a3
Fixed scoreboard serialization
2014-01-23 16:27:23 +02:00
Mattes D
9ae31d913c
Improved code safety for the Compact world storage.
...
That was a huge chunk of smelly code.
2014-01-23 14:21:56 +01:00
Mattes D
97ee3340e3
Minor style improvements for the merged PR.
2014-01-23 14:14:33 +01:00
Mattes D
0526ed327c
Merge remote-tracking branch 'xdot/master'
...
* xdot/master:
Command block fixes 2
2014-01-23 14:06:05 +01:00
andrew
4ef61d8bf6
Command block fixes 2
2014-01-23 14:57:04 +02:00
Mike Hunsinger
00d7317746
Removed extra line
2014-01-23 00:53:00 -07:00
Mike Hunsinger
41b05416c7
Split TossItem into three Toss functions (Held, Equipped and Pickup)
2014-01-23 00:27:39 -07:00
madmaxoft
eb9bebf755
Replacing CryptoPP with PolarSSL.
...
This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet.
2014-01-22 22:19:33 +01:00
madmaxoft
3b96fc1e54
Authenticator: Reduced logging levels.
2014-01-22 22:06:48 +01:00
Tycho
5ef0a00a6c
Fixed spelling error
2014-01-22 10:39:09 -08:00
Tycho
571200019d
Added manual bindings for moved functions
2014-01-22 10:35:36 -08:00
Tycho
1c320fa18c
formatting changes
2014-01-22 10:13:41 -08:00
Tycho
c832fbeb8e
Merge branch 'master' into GeneratingBenchmark
...
Conflicts:
src/World.h
2014-01-22 09:13:12 -08:00
tonibm19
d59a0156ce
Fixed compilation on VC2008
2014-01-22 16:58:25 +01:00
Mattes D
26586fdb92
Merge pull request #566 from xdot/master
...
Scoreboard
2014-01-22 06:05:17 -08:00
andrew
dd04f5a73c
cWorld now saves/loads the scoreboard
2014-01-22 15:49:21 +02:00
madmaxoft
2a018cfa49
Implemented cPluginManager:CallPlugin() API.
...
This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all.
2014-01-21 23:00:35 +01:00
andrew
9bd8f74b59
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-01-21 20:40:41 +02:00
andrew
fa4750f015
Scoreboard SendTo()
2014-01-21 19:43:13 +02:00
andrew
aa61f55b74
Scoreboard protocol support
2014-01-21 15:58:17 +02:00
Alexander Harkness
9c93ab15ab
Fix a crash but somewhere...
2014-01-20 19:02:37 +00:00
Tycho
ca3389231e
Actually implemented interfaces
2014-01-20 10:15:19 -08:00
Tycho
4f09e8df6e
Moved Schematic file methods to seperate class
2014-01-20 09:59:12 -08:00
Tycho
613f238ab6
Merge branch 'ForEachChunkProvider' into GeneratingBenchmark
...
Conflicts:
src/World.h
2014-01-20 09:37:31 -08:00
Tycho
16375f6aad
Merge branch 'master' into GeneratingBenchmark
...
this merge is necessary,
2014-01-20 09:21:47 -08:00
Tycho
9bb61e6e2e
Seperated BlockArea From World
...
If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
2014-01-20 09:17:24 -08:00
andrew
ff2302ebd5
Scoreboard serialization
2014-01-20 16:45:40 +02:00
andrew
7728f4bcbe
Scoreboard deserialization
2014-01-20 16:10:39 +02:00
madmaxoft
41618bf242
Changed the cWorld::ScheduleTask() signature.
...
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
2014-01-19 23:49:19 +01:00
madmaxoft
4a01879911
cLuaState can now check function params.
2014-01-19 23:45:26 +01:00
Mattes D
865016abe2
Merge pull request #569 from worktycho/EnchantmentsFix
...
Enchantments fix
2014-01-19 13:50:50 -08:00
Mattes D
fde8b0be60
Merge pull request #565 from mc-server/commandblockfixes
...
Command block fixes
2014-01-19 13:47:52 -08:00
Tycho
bd4278aca1
Added Inifile and OSSupport Linking
2014-01-19 12:51:23 -08:00
Tiger Wang
e4c3d799ff
Removed unneeded paramters
2014-01-19 19:42:25 +00:00
Tiger Wang
83cbe8c139
Begin implementing ascending rails
2014-01-19 19:31:17 +00:00
Tiger Wang
3700ad8546
Added one more direction into collision checks
...
* Added direction XM_XP
* Improved performance, thanks STR and xoft
2014-01-19 18:42:05 +00:00
madmaxoft
3c0e8c8da0
Rewritten SocketThreads for proper shutdown scenario.
...
This fixes #560 and #390 .
2014-01-19 19:31:43 +01:00
Tiger Wang
9a580146e4
Minecart improvements and fixes
...
* Fixed curved rails
* Fixed detector rails in certain situations
* Fixed powered rails and others passing bad meta to SnapToRail()
2014-01-19 18:27:06 +00:00
Tiger Wang
fc622ce194
Fixed weird meta with curved rails
2014-01-19 18:24:56 +00:00
Tycho
f13a14d2cf
Switched EnchantmentSerilizer to namespace
2014-01-19 08:52:45 -08:00
Mattes D
6976735a53
Merge pull request #551 from worktycho/schedular
...
Implemented xoft's suggestion for a saturating counter in the scheduler
2014-01-19 07:46:34 -08:00
Tycho
e14ddff1c0
Spilt Writing of Enchantments to seperate class
...
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
2014-01-19 07:38:59 -08:00
madmaxoft
dc70d04cdd
SocketThreads: Removed unused code.
2014-01-19 16:15:56 +01:00
Tiger Wang
8467f5dfae
Added more rail functionality
2014-01-19 14:52:45 +00:00
andrew
f321b5d224
Scoreboard improvements
2014-01-19 16:02:37 +02:00
Tiger Wang
82b2290b74
Merge remote-tracking branch 'origin/master' into minecartimprovements
2014-01-19 13:55:22 +00:00
Tiger Wang
1af89a8b50
Changed SendBlockEntity format slightly
...
* Writing NBT is now in Protocol, not BlockEntity files
* Fixed a last output bug
2014-01-19 13:25:35 +00:00
andrew
2b94361059
Basic scoreboard implementation
2014-01-19 14:20:57 +02:00
Mattes D
972585363d
Merge pull request #559 from mc-server/SpawnMobParticles
...
Removed the particles when a mob spawns.
2014-01-18 23:23:53 -08:00
Tiger Wang
a85b2897e0
Implemented MC|Brand response
2014-01-19 01:06:19 +00:00
Tiger Wang
f8c8dcc7f3
Improved command blocks
...
* Their command and previous output are displayed on the client
* They have a BlockHandler implementation, so you can't place blocks on
them anymore
+ As a side effect, implemented UpdateBlockEntity
2014-01-19 00:54:38 +00:00
STRWarrior
24df625fbd
Exported cFloater to the Lua API.
2014-01-19 00:04:46 +01:00
STRWarrior
7153bc0578
Fixed compiler error.
2014-01-18 23:42:48 +01:00
Tiger Wang
ddd03a050b
Minecart collision and general improvements
...
+ Implemented collision on one type of rail
* Improved curved rails somewhat
* Fixed a crash bug
2014-01-18 20:58:26 +00:00
Mattes D
36b9d42819
Merge pull request #557 from xdot/master
...
Command blocks
2014-01-18 11:39:42 -08:00
andrew
a037172465
Command block fixes
2014-01-18 21:27:54 +02:00
madmaxoft
fab726282c
HTTP connections aren't kept alive unless explicitly enabled.
...
Only the client can decide that the connection can be kept alive, we must close the socket if the client doesn't indicate keepalive support.
This will provide a fix for #390 when #560 is fixed; until then the issue remains, just it's no longer HTTPServer's fault.
2014-01-18 20:20:56 +01:00
Tycho
d93a4362b4
Fixed iterators bug
2014-01-18 10:57:25 -08:00
STRWarrior
1cced1664f
Removed the particles when a mob spawns.
2014-01-18 19:41:31 +01:00
andrew
992053b32a
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-01-18 20:38:02 +02:00
andrew
02c9aa2b1e
Parse the MC|AdvCdm plugin message
2014-01-18 19:58:46 +02:00
madmaxoft
e68521deac
Alpha-sorted the finishers.
2014-01-18 17:03:43 +01:00
madmaxoft
896f1a26ec
Merged branch 'NetherFinish'.
2014-01-18 17:03:31 +01:00
andrew
1ad6469a18
Command blocks: Execute()
2014-01-18 16:59:33 +02:00
Tycho
160a27cced
switched to using m_WorldAge rather than m_TickID
2014-01-18 06:15:33 -08:00
andrew
be5299350a
Command block (de)serialization
2014-01-18 15:40:47 +02:00
STRWarrior
188cb1f6bc
Fixed errors.
2014-01-18 14:17:26 +01:00
andrew
9a9b51a513
Basic command block implementation
2014-01-18 15:16:47 +02:00
STRWarrior
ca27f87272
Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's
2014-01-18 14:16:07 +01:00
STRWarrior
dd7c02bba9
Some tweaks.
...
Everything generates more often.
Fire can only spawn on ForeverBurning blocks.
2014-01-18 13:45:41 +01:00
STRWarrior
087d650aed
Fixed bug where only brown mushrooms would spawn.
2014-01-18 00:37:21 +01:00
STRWarrior
9f17c9799b
It now actualy works.
2014-01-18 00:27:13 +01:00
Mattes D
9aca5b4b99
Merge pull request #552 from worktycho/c++11
...
Changed std to c++11 in clang to fix va_copy issues
2014-01-17 13:59:58 -08:00
STRWarrior
7c787de261
First attempt at creating a clumb version NetherFinisher.
2014-01-17 22:58:01 +01:00
Tycho
a54cbba0fd
Added user setting compression factor
2014-01-17 11:01:14 -08:00
Tycho
287144839e
Increased tick count to long
2014-01-17 10:23:40 -08:00
Tycho
80f2f21f4c
Changed std to c++11 in clang to fix va_copy issues
2014-01-17 10:10:31 -08:00
Tycho
ce030bc7c9
Implemented xsofts suggestion for a saturating counter in the scheduler
2014-01-17 10:07:33 -08:00
Mattes D
79c1f6f438
Merge pull request #534 from mc-server/SpawnMinecart
...
Added cWorld::SpawnMinecart.
2014-01-17 02:27:56 -08:00
madmaxoft
2354ac2783
Fixed SIGABRT_COMPAT on other architectures.
2014-01-17 11:13:35 +01:00
madmaxoft
aec5200893
Removed internal cEntity::GetRot() usage.
2014-01-17 11:11:17 +01:00
madmaxoft
ed1d336614
Merge remote-tracking branch 'origin/customnames'
2014-01-17 10:44:23 +01:00
madmaxoft
3a1c0f2aef
Protocol 1.7: More output on unknown packets / protocol states.
2014-01-17 10:12:27 +01:00
Tiger Wang
7ecf50c309
Fixed block break packet number
2014-01-16 22:42:47 +00:00
Tiger Wang
d675173b80
Changed newline character because of issues
2014-01-16 22:30:57 +00:00
Tiger Wang
952c53eb4e
Removed CustomCopy()
2014-01-16 21:41:55 +00:00
Tiger Wang
590a8c45c5
Really did what xoft wanted
2014-01-16 21:41:08 +00:00
Tiger Wang
d3bc92c65d
Fixed #535
2014-01-16 21:51:30 +01:00
madmaxoft
4da8818291
Fixed SIGPIPE on cSocket::Send().
2014-01-16 21:08:17 +01:00
Tiger Wang
7eb3cabd19
Fixed #535
2014-01-16 19:55:21 +00:00
madmaxoft
a085319455
Protocol 1.7: Unknown packets are dumped to log in Debug mode.
2014-01-16 20:39:59 +01:00
madmaxoft
de4ac55398
Disabled excessive entity-related logging in Debug mode.
2014-01-16 20:31:06 +01:00
madmaxoft
c44ce84497
Fixed whitespace in previous commit.
2014-01-16 20:30:25 +01:00
Tiger Wang
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
madmaxoft
343136a2ae
Finished exporting cWorld:ScheduleTask() to Lua API.
2014-01-16 19:56:08 +01:00
Tiger Wang
5d03e49c13
Possibly did what xoft wanted
2014-01-16 18:44:11 +00:00
Tiger Wang
3373daca26
Merge remote-tracking branch 'origin/master' into customnames
2014-01-16 18:37:46 +00:00
