1
0
Commit Graph

4250 Commits

Author SHA1 Message Date
STRWarrior
3b74107bf3 Changed Nether composition to change the threshold from a cubic noise 2015-04-20 18:03:25 +02:00
Mattes D
b97f41b8c6 ItemHandler type fixes. 2015-04-20 09:17:26 +02: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
Mattes D
c9fbcea66d ItemHandler: Using automatic array bounds. 2015-04-20 08:34:44 +02:00
Mattes D
c5ad058424 HangingEntity: Fixed a needless clang warning. 2015-04-19 21:34:56 +02:00
STRWarrior
423bbbdbe1 Fixed typo in NetherForts initialization
The S in NetherForts was missing
2015-04-19 20:53:25 +02:00
NiLSPACE
3056e6d324 Merge pull request #1877 from mc-server/GlowStone
Added GlowStone finisher
2015-04-19 20:23:15 +02:00
STRWarrior
f17f0fa3bd GlowStone: Changed order of initialization of member variables 2015-04-19 20:08:51 +02:00
STRWarrior
f1558c6015 Fixed style 2015-04-19 19:59:27 +02:00
Mattes D
ba6f5aea4c Merge pull request #1875 from mc-server/PluginFolders
Split the plugin names and plugin folders to avoid confusing them.
2015-04-19 19:53:14 +02:00
STRWarrior
e7542f676d Added GlowStone finisher 2015-04-19 19:45:18 +02:00
Mattes D
fd497b8269 ClientHandle: Fixed re-sending refused right-clicks.
The coords weren't checked against Y boundary and -1 coords weren't sent.
This fixes mc-server/Gallery#45.
2015-04-19 17:33:58 +02:00
Mattes D
d40078d163 HTTP: Error message is sent as the payload as well.
This shows the error message in the browsers. Before, the browsers would display just a blank page.
2015-04-19 17:32:44 +02:00
Mattes D
be40ea323a Refresh plugin list before trying to load. 2015-04-19 17:25:48 +02:00
Mattes D
4a946aa8c4 Added cPluginManager:IsPluginLoaded() API, better load error msgs. 2015-04-19 17:20:15 +02:00
Mattes D
3b49a1d250 Merge pull request #1864 from mc-server/StrictRecipeMatching
Recipes match zero DamageValue strictly.
2015-04-19 14:41:35 +02:00
Mattes D
288d2280fa Refactored cWebPlugin for C++11 style and proper WebTab clearing. 2015-04-19 14:35:04 +02:00
Mattes D
a9b5a6c3a6 Split the plugin names and plugin folders to avoid confusing them.
Ref.: http://forum.mc-server.org/showthread.php?tid=1877
2015-04-19 10:57:41 +02:00
mathias-gh
9cbd7f64c1 Update IronGolem.cpp 2015-04-17 21:18:34 +03:00
mathias-gh
f370443b9b Added MobTypeName for Giant 2015-04-17 19:33:34 +03:00
Tiger Wang
15afff1eab Fixed arm swing animation
* Fixes #1861
2015-04-17 15:33:40 +01:00
Mattes D
0b3fd73f90 Recipes match zero DamageValue strictly.
To match any DamageValue for the ingredient, an explicit "-1" as the DamageValue must be specified.
Fixes #1859.
2015-04-16 21:33:42 +02:00
Mattes D
ffe7dae4fc Fixed PolishedGranite et al crafting recipes.
Fixes #1774. Ref.: #1859
2015-04-16 20:59:57 +02:00
Mattes D
1d8a22cb7b Merge pull request #1858 from mc-server/BucketPluginCalls
Bucket plugin calls
2015-04-15 11:07:03 +02:00
Mattes D
54289aeccb Merge pull request #1844 from DevToaster/master
Modified physics for more vanilla-like behavior
2015-04-14 22:31:09 +02:00
Mattes D
d421befece Scooping up fluid calls the player placement hooks.
Ref.: #1857.
2015-04-14 10:55:48 +02:00
Mattes D
de8e5ea8e4 Placing a fluid from bucket calls plugin hooks.
Ref.: #1857.
2015-04-14 10:49:01 +02:00
Mattes D
29af16143e Removed HOOK_MAX and HOOK_NUM_HOOKS from Lua API. 2015-04-13 12:33:25 +02:00
Mattes D
9367d44cb4 Merge pull request #1854 from mc-server/FileOps
File ops
2015-04-12 10:54:05 +02:00
Mattes D
79e8f8fb20 cFile:ChangeFileExt now accepts extensions with leading dot, too. 2015-04-11 17:42:32 +02:00
Mattes D
c4842cb9aa Added more cFile API functions.
GetLastModificationTime, GetPathSeparator() and GetExecutableExt()
2015-04-11 10:06:08 +02:00
Mattes D
38d666432d Fixed plugin hook calls when unloading plugins.
If a plugin installs any hooks in its Initialize method and then causes the Lua runtime to abort, the server asserted because the hooks were called while the plugin was being unloaded.
2015-04-10 22:31:23 +02:00
Mattes D
65a1158e40 Added proper implementation of cFile::ChangeFileExt(). 2015-04-10 21:40:45 +02:00
STRWarrior
13b96a40ea Added extra divide operator to Vector3.
The multiply operator had one for both a different vector and a number, but the divide operator didn't.
2015-04-07 13:25:55 +02:00
Mattes D
4836d07bfa Fixed MSVC warnings, improved comments. 2015-04-06 22:01:25 +02:00
Mattes D
6952f2295a Added cFile:ChangeFileExt() function. 2015-04-06 22:00:54 +02:00
Mattes D
31953b19b8 Fixed crash on exit introduced with Windows Service capability.
Ref.: #1845
2015-04-05 17:07:29 +02:00
Mattes D
e42e46d5f9 Merge pull request #1846 from mc-server/WorldChanging
Fixed player switching world bug
2015-04-04 11:32:17 +02:00
STRWarrior
399392195f Fixed players not appearing/disappearing when traveling to a new world. 2015-04-03 18:40:20 +02:00
STRWarrior
e6819c4c65 Fixed the nether and end getting snow if they were generated in the overworld. 2015-04-03 16:32:31 +02:00
Mattes D
afdd751fe3 Merge pull request #1799 from SnappingTurtles/BlockButton
Buttons can be placed on the top and on the bottom face of a block
2015-04-03 15:41:39 +02:00
Anthony Birkett
51891b766c Working as a Windows service. Starts and stops correctly.
Added "/service" switch, to prompt the binary to attempt starting as a service.
Added service* methods, to control service startup.
Split up main() into universalMain(), which contains the startup code for both service and normal start.
Added cRoot::m_RunningAsService bool,
Added cRoot::SetStopping(bool) to allow a stop request to be sent by the service controller.
Added cBlockIDMap::init() to avoid loading items.ini before the working directory has been set.
2015-04-01 00:03:37 +01:00
DevToaster
a9583149b4 Changed air drag for pickups 2015-03-31 11:40:31 -04:00
DevToaster
45c84ea933 Changed air drag units to 'interpolated ticks' per second 2015-03-31 11:03:35 -04:00
DevToaster
d315534b76 Adjusted projectile physics 2015-03-30 20:07:19 -04:00
DevToaster
c743c7fd0c Modified physics for more vanilla-like behavior 2015-03-30 19:42:32 -04:00
Mattes D
53f5cc209f Fixed placing bottom half-slabs by clicking a top half-slab.
Ref.: #1837
2015-03-28 10:44:42 +01:00
Alexandre Guertin
97daf810ff Removed 0x6, 0x7 from BlockButton. 2015-03-25 16:12:02 -04:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D
f1ef7f57ff Merge pull request #1775 from tommysanterre/terrainheightfix
Correct all world height validations.
2015-03-23 12:25:22 +01: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
8df9f1685a ProtoProxy: Fixed connection and logging. 2015-03-22 15:00:51 +01:00
worktycho
d02c908670 Merge pull request #1786 from mc-server/pipelineSyntax
Added pipelining syntax for generators
2015-03-21 21:08:33 +00:00
worktycho
7089b68030 Style fixes 2015-03-21 19:45:01 +00:00
worktycho
d966200a6c Fixed alignment 2015-03-21 19:35:25 +00:00
Mattes D
c3c29577a5 Fixed signedness warnings in Protocol. 2015-03-21 16:11:57 +01:00
Mattes D
b698286e86 Creeper: Fixed skeleton check. 2015-03-21 15:52:49 +01:00
Mattes D
3923e3e37a Fixed signedness issues in protocols. 2015-03-21 15:40:56 +01:00
Mattes D
e9b8be25f9 Changed linked world name variables and setters / getters.
Ref.: #1792
Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
2015-03-21 15:20:31 +01:00
Mattes D
cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Mattes D
7e7527cc43 Fixed trailing whitespace. 2015-03-21 14:07:16 +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
Tiger Wang
60a52288d8 Improved arrow in-flight and block-hit appearance
* Fixes #1495
2015-03-20 22:32:32 +00:00
Mattes D
0f45d1fbe2 cPluginLua:cResettable no longer shares CS with plugin.
This fixes locking the resettable while the plugin is already gone. Hopefully no deadlocks.
2015-03-20 16:51:49 +01:00
Mattes D
8a43da0723 Merge pull request #1822 from mc-server/ResettableLuaCallback
Added cPluginLua::cResettable interface, used for scheduled tasks.
2015-03-20 16:11:50 +01:00
Mattes D
781c8683f7 Added cPluginLua::cResettable interface, used for scheduled tasks.
This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data.
Fixes #1556.
2015-03-20 15:13:33 +01:00
Mattes D
967ece1684 Merge pull request #1821 from bibo38/bugfix1765
Removed Metavalue from Piston drops.
2015-03-20 12:13:21 +01:00
bibo38
3058c4c010 Removed Metavalue from Piston drops. Bugfix #1765 2015-03-20 11:14:42 +01:00
Tommy Santerre
3f6d823aa4 Correct world height validations.
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
2015-03-19 20:32:17 -04:00
Mattes D
2d1d4ae3e3 Removed unwanted base classes from Lua API. 2015-03-19 21:26:38 +01:00
Mattes D
93031dffd8 AllToLua: Fixed cMonster inheritance. 2015-03-19 21:06:28 +01:00
Mattes D
2fed8c3227 Improved DoWithID bindings. 2015-03-19 16:24:32 +01:00
bibo38
54d97f8c17 Removed wrong else clause, which caused that the following if-Statement got only executed in rare cases. This has blocked the creation of new Fluid-Sources. Bugfix #1783 2015-03-19 13:23:03 +01:00
Mattes D
f3046417ec Fixed a clang warning, improved comments. 2015-03-19 12:46:37 +01:00
Mattes D
9eb9541060 AllToLua: Removed an unneeded class declaration.
It's perfectly possible to declare a class in ManualBindings without the need for declaration in AllToLua.pkg.
2015-03-19 12:34:16 +01:00
Mattes D
09da6e7a6e AllToLua: Fixed the parse order for bindings generation.
Fixes #1789.
2015-03-19 12:19:04 +01:00
Mattes D
5f660f7677 Added cNetwork initialization to program start.
Otherwise the server could crash because MSVC doesn't implement magic statics yet.
2015-03-18 22:07:57 +01:00
Mattes D
49e59ee06b World:DoWithEntityByID() checks the entities-to-add as well.
This allows plugins to create entities and immediately act on them using that call. This will most likely need to be added to most of the DoWith<> and ForEach<> calls.
2015-03-18 15:35:19 +01:00
Mattes D
0aff42a4bc Network: Close the UDP endpoint in destructor. 2015-03-18 13:50:43 +01:00
bibo38
7b025d6605 Changed Variable types of Endianness.h to uniform UInt* types from Globals.h 2015-03-17 20:00:21 +01:00
bibo38
9ac094e95a Fixed double underscore identifiers in the Endianess.h file, which are reserved for implementation use. Bug #1715 2015-03-17 18:22:27 +01:00
Mattes D
0add3d4617 Merge pull request #1810 from mc-server/paintings
Paintings
2015-03-15 14:30:23 +01:00
worktycho
83531707f3 Merge pull request #1811 from mc-server/grass
Fixed grass spread, closes #1743
2015-03-15 12:16:37 +00:00
Tiger Wang
a8a2d3d504 Use thread_local in cFastRandom 2015-03-14 21:52:13 +00: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
Mattes D
ebf0126dc9 Merge pull request #1808 from tumultenrx/master
Monsters will now attack. Additional checks have been added when generating spawn.
2015-03-14 22:32:23 +01:00
tumultenrx
5c45c8897c Fixed a small bug 2015-03-14 20:45:16 +01:00
Tiger Wang
e94886c140 Fixed grass spread, closes #1743
- Removed the salt parameter in cFastRandom functions, it wasn't doing
what we thought it was following the move to C++11
2015-03-14 00:59:53 +00:00
Tiger Wang
cb8ea41c90 Fixed style violations 2015-03-13 23:22:09 +00:00
Tiger Wang
3d398baf35 cPainting saving implemented
Additionally, it now inherits from cHangingEntity.
2015-03-13 23:05:06 +00:00
Tiger Wang
e15e30a030 Fixed confusion over Item Frame directions 2015-03-13 22:29:27 +00:00
NiLSPACE
57d2a09c8c Merge pull request #1809 from flx5/master
Performance improvements for #1807
2015-03-13 08:55:48 +01:00
tumultenrx
a215070cf2 Monsters will now attack. Additional checks have been added when generating spawn.
Monsters will now attack. Additional checks have been added when generating spawn.
2015-03-13 00:02:36 +01:00
flx5
936d56a711 Performance improvements for #1807 2015-03-12 20:16:12 +01:00
Mattes D
f9991c9f92 Merge pull request #1761 from mc-server/NetworkIPEnum
cNetwork: Added EnumLocalIPAddresses() function.
2015-03-12 13:35:45 +01:00
Mattes D
439eb8d6cb Merge pull request #1807 from flx5/master
Fixes #493 and #490
2015-03-11 22:43:52 +01:00
flx5
f6912bd01c Fixed coding conventions for Pull Request #1807 2015-03-11 20:02:11 +01:00
flx5
d8ab99e944 Fixed issue with quotes not appearing in pairs 2015-03-11 19:52:49 +01:00
Mattes D
1b60fe12a8 Merge pull request #1665 from mc-server/Inventory
Own classes for all windows and implemented vanilla-like shift click.
2015-03-11 14:26:04 +01:00
tycho
430cbb8c83 Changed pipeline character from >> to | 2015-03-11 10:42:45 +00:00
tycho
8646e95b6f Fixed style and removed false positives
Relaxed the rules for < followed by an && and removed rule for < following an &&
2015-03-11 10:39:49 +00:00
flx5
76012ee090 Fixed some markup issues 2015-03-11 04:38:15 +01:00
flx5
451ab6860f Fixed some markup issues 2015-03-11 04:33:17 +01:00
flx5
d130696e95 Fixes #493 and #490 2015-03-11 04:14:17 +01:00
Tiger Wang
4ffaace384 Use std::memcpy to fix alignment
As suggested by @madmaxoft
2015-03-10 22:25:53 +00:00
Tycho
ff785188f9 Fixed Sequence Generator for IntGen 2015-03-10 22:19:03 +00:00
worktycho
45fa2d98db Fixed Bug in cChunkData.
FIxed a bug where if the index was not aligned with the sections empty sections would not be set in the correct location.
2015-03-10 20:32:01 +00:00
Howaner
685f6e3713 Moved window code into cpp files 2015-03-10 19:40:53 +01:00
Alexandre Guertin
adf5edc913 Buttons can be placed on the top and on the bottom face of a block 2015-03-09 18:13:55 -04:00
Howaner
a96c21fc0d Merge branch 'master' into Inventory 2015-03-09 22:39:11 +01:00
Howaner
ce6219530a Fixed client kick/crash if many block changes happend 2015-03-09 22:32:12 +01:00
Tiger Wang
20da3d34a5 Potential Linux implementation 2015-03-08 16:54:44 +00:00
STRWarrior
d19f2a472b Added parenthesis around the comparisons 2015-03-08 15:22:01 +01:00
STRWarrior
2bbfd0341f Added proper trees to Mesa biomes
Mesa only has small apple trees.
2015-03-08 13:30:21 +01:00
STRWarrior
134246fb15 Added grass/course dirt layer on MesaPlateauF(M) 2015-03-08 13:29:49 +01:00
Tiger Wang
3d81b0093e Merge pull request #1784 from mc-server/SteppyHeiGen
Added Steppy height generator.
2015-03-06 11:53:12 +00:00
Tiger Wang
f3da0cf1ae Reverted non-functional changes 2015-03-05 21:21:39 +00:00
Alexander Harkness
7348bf3853 Grass checks for sufficient light before spreading 2015-03-05 19:30:00 +00:00
joshi07
f71b1fe799 Added OnTeleportEntity hook for plugins.
Plugins may or may not allow teleport to the new position.
Updated the HookNotify plugin with it.
2015-03-05 11:52:42 +01:00
Mattes D
d4b505db02 Lua API: Fixed md5 and sha1 hex formatting.
std::setw() is only valid for one output operation and needs to be set again in each loop repetition.
2015-03-03 01:28:58 +01:00
Mattes D
7767af9493 Merge pull request #1781 from mc-server/Vines
Vines in caves
2015-03-01 22:52:40 +01:00
STRWarrior
db2a406c13 Removed trailing whitespace 2015-03-01 20:09:44 +01:00
STRWarrior
3d3735a378 Replaced IntNoiseXX with IntNoiseXXInt 2015-03-01 20:08:05 +01:00
STRWarrior
e63f9bdc1a Replaced cFinishGenPtr with std::make_shared 2015-03-01 20:06:44 +01:00
Tycho
bdea6c92b3 Fixed Style
Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates
2015-03-01 14:51:07 +00:00
Tycho
3f61255fe1 Added pipelining syntax for generators 2015-03-01 14:27:01 +00:00
Mattes D
d2e1ed3a3b Steppy HeiGen: Fixed Linux compilation. 2015-03-01 12:40:53 +01:00
Mattes D
a20c1c6d43 Merge pull request #1780 from DevToaster/master
Modified Player class to use int data type for experience
2015-03-01 12:16:06 +01:00
Mattes D
780a9ae9d1 Added Steppy height generator. 2015-03-01 12:13:39 +01:00
STRWarrior
0394acfc0c Made the minimum vine level configurable 2015-02-28 22:40:13 +01:00
STRWarrior
19d7ec51a0 Implemented a vines finisher that creates vines in jungle biomes 2015-02-28 22:37:33 +01:00
DevToaster
f5a216cabc Changed C-styled casts to static_cast and removed unneeded casts 2015-03-01 03:45:06 +10:30
NiLSPACE
24bb911c3c Merge pull request #1769 from mc-server/snowweather
Snow weather
2015-02-28 18:05:06 +01:00
DevToaster
e012c06281 Replaced short int with int for Player experience 2015-03-01 03:09:36 +10:30
DevToaster
b65a6ef210 modified: src/Entities/Player.cpp
modified:   src/Entities/Player.h
2015-03-01 03:03:41 +10:30
STRWarrior
224df08d30 GetSnowStartHeight returns an int 2015-02-28 17:27:28 +01:00
Mattes D
88fc70a06a Fixed door placement.
Doors now have hinges on the correct side, based on what the surroundings are when placing them.
2015-02-28 17:16:21 +01:00
STRWarrior
e63b4f4913 Added experience drops when mining ores 2015-02-28 16:34:17 +01:00
STRWarrior
81e8577cfd changed int to unsigned
And return 0 instead of -1
2015-02-26 20:26:45 +01:00
Raekye
378528136c use DoSetSpeed in AddSpeed* in Entity.cpp 2015-02-25 20:56:45 -05:00
STRWarrior
ac2c88b451 Ice finisher uses GetSnowStartHeight instead of specific biomes 2015-02-25 19:22:44 +01:00
STRWarrior
ba3eaf9223 Snow finisher uses GetSnowStartHeight instead of specific biomes 2015-02-25 19:12:53 +01:00
STRWarrior
b3f0751130 Weather: Snow starts forming when the top block is at the right height or higher 2015-02-25 19:02:08 +01:00
STRWarrior
f1f23b09ae Added GetSnowStartHeight
returns the height of a biome where it starts snowing
2015-02-25 19:00:52 +01:00
STRWarrior
a56b6906d6 Fixed flowing water turning into ice when snowing 2015-02-25 17:26:48 +01:00
Mattes D
81c49a0246 Merge pull request #1762 from mc-server/LuaStringCompress
Lua string compress
2015-02-25 10:18:39 +01:00
Mattes D
c286b186c4 1.8 Protocol: Fixed a possible race condition.
Fixes #1759.
2015-02-24 10:04:43 +01:00
STRWarrior
9e1db16ba4 Fixed operators 2015-02-23 16:09:35 +01:00
STRWarrior
d39d2ca5e9 Added forgotten indent 2015-02-23 15:40:31 +01:00