mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1375 commits 1 branch 14 tags 87 MiB
Commit graph

1025 commits

Author SHA1 Message Date
md_5
e46e6c46a1 Upstream merge, lots of conflicts 2014-06-22 19:28:17 +10:00
md_5
463e6f351e Shave nearly 2mb off jar size by not embedding our copy of trove since Minecraft now includes it. 2014-06-21 16:30:09 +10:00
md_5
b4f8ae96a2 Prevent Unbounded IntCache Growth 
Based on work by Peter Lawrey, this commit prevents unbounded growth of the integer cache and instead caps it to a value specified in the configuration (1024 by default). Should prevent thrashing, especially around world generation.
 2014-06-20 19:40:55 +10:00
Thinkofdeath
7f6d9d1fb7 Fix the restart command sometimes deadlocking the server 2014-06-14 16:01:05 +01:00
md_5
f2c8426b20 Revert LongHash changes 2014-06-11 21:07:22 +10:00
md_5
8d19f7fc9c Improve lsw too 2014-06-09 19:04:53 +10:00
Antony Riley
a9bcec2567 Improve LongHash performance - take #2 2014-06-09 18:58:20 +10:00
md_5
0dc2b96f20 Revert "Improve LongHash performance." 
This reverts commit 1705259934.
 2014-06-09 18:28:38 +10:00
Antony Riley
1705259934 Improve LongHash performance. 2014-06-09 17:52:31 +10:00
Thinkofdeath
27cb8a7e6d Upstream merge 2014-06-02 15:38:03 +01:00
Thinkofdeath
b572a59936 Fix some missed cases with data value blocking 
The item and block forms of double plants have different rules
 2014-05-30 20:28:14 +01:00
Evan A. Haskell
5daa7e5418 Better comments on hopper tick patch 2014-05-30 13:11:07 +10:00
Thinkofdeath
57147d925c Improve the data value filter to cover item stacks as well 2014-05-28 13:51:53 +01:00
md_5
ae34175e3d Upstream merge 2014-05-27 17:40:02 +10:00
md_5
95e4d28a35 Replace typing yes into the console with a 10 second wait - most have updated or are aware of the changes by now 2014-05-25 14:40:33 +10:00
drXor
551c6c2dd9 Add config option for when UserCache saves 2014-05-24 17:20:02 +10:00
md_5
1b946aa470 Oops: Fix compile 2014-05-24 17:17:32 +10:00
Evan A. Haskell
32f41dfe9a Add alternative hopper ticking 
This change offers a config option intending to improve hopper ticking performance while maintaining vanilla hopper behavior. Rather than polling each hopper each tick, this alternative method relies on inventory changes and redstone updates to schedule a hopper tick.
 2014-05-24 17:16:57 +10:00
md_5
1bbcf1c272 Add an API to restart with a specific script. 2014-05-24 17:10:15 +10:00
Thinkofdeath
7fcaf3f2c7 Correct formatting of the "Configurable UserCache cap" patch 2014-05-23 23:07:20 +01:00
Thinkofdeath
6cd2b27743 Fix a ConcurrentModificationException in the antixray 2014-05-21 12:05:08 +01:00
Thinkofdeath
1188b53bae Modify the async skull converter to work around a client bug 2014-05-17 09:26:14 +01:00
riking
294c4d530f Process conversation input on the main thread. BUKKIT-5611 2014-05-15 18:25:25 +10:00
md_5
e052eada8c Upstream merge: conflict resolution and version bump 2014-05-15 17:05:45 +10:00
Thinkofdeath
65b083577b Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream 2014-05-14 14:05:42 +01:00
Thinkofdeath
e21770a060 Upstream merge 2014-05-14 14:02:09 +01:00
Thinkofdeath
fbdc043a85 Remove the null world/locations patches 
These isn't help catch the plugin causing the issues and actually broke some plugins in the process
 2014-05-13 14:03:01 +01:00
Thinkofdeath
1f827c35b8 Correct // Spigot comment 2014-05-11 11:28:57 +01:00
Thinkofdeath
a0fba09ac1 Don't fire PlayerPortalEvent when we don't have a target 2014-05-11 11:25:42 +01:00
CodeCrafter47
98272bf282 fixed file extension for offline mode player data 
added ".dat" file extension so this is able to find a players offline mode data if available
 2014-05-11 12:04:57 +10:00
Thinkofdeath
6d0b39bc76 Check the right banlist for ip bans 2014-05-07 23:34:41 +01:00
hauno
531071af97 Adds a fix for Scores that can potentially crash clients. 2014-05-07 16:28:25 +10:00
ninja
124d44473c Add PlayerSpawnLocationEvent - API & implementation. 2014-05-06 16:14:49 +10:00
md_5
2031db9986 Rebuild patches from last few PRs 2014-05-06 16:10:35 +10:00
drXor
9525c226d3 Add config option for the size cap of UserCache. 2014-05-06 16:10:17 +10:00
David
4d2b4b4822 Use different replacement blocks for normal, nether and end worlds in Orebfuscator 2014-05-06 16:07:25 +10:00
Zach Brown
928f6e1ea3 Automatically set connection throttle for bungee configurations 2014-05-06 16:05:07 +10:00
Thinkofdeath
57ffba423f Remove the "Allow skull owners to be removed" patch as it was fixed upstream 2014-05-04 12:38:30 +01:00
md_5
38e8d2b53c Upstream merge: possibly fix some head related bugs. 2014-05-04 10:22:14 +10:00
Thinkofdeath
e24ab2a11f Upstream merge: Fix ender crystal stack overflow 2014-05-03 23:29:47 +01:00
Jonas Konrad
dda042aca8 Fix race condition that could kill connections before they 
were initiated
 2014-05-02 20:11:54 +10:00
Thinkofdeath
5d4ed8047a Upstream merge: Chicken jockey despawning and generation fixes 2014-04-30 15:13:37 +01:00
Thinkofdeath
06bfcd26fb Allow skull owners to be removed 2014-04-30 12:51:07 +01:00
Thinkofdeath
b30f0b69c6 Remove a file that snuck in to the last commmit 2014-04-29 09:30:17 +01:00
Thinkofdeath
e161d2f0cb Disable Watchdog when restarting 2014-04-29 09:24:36 +01:00
md_5
7af31d2942 Revert "Merge pull request #155 from yawkat/killed-connections-fix" 
This reverts commit ce42d88219, reversing
changes made to c3eeab45cd.
 2014-04-27 10:52:18 +10:00
Jonas Konrad
f48f848b81 Fix race condition that could kill connections before they 
were initiated
 2014-04-25 23:49:04 +02:00
Thinkofdeath
c3eeab45cd Fix hoppers replacing the items with the left overs from removing instead taking the items off the stack 2014-04-24 20:49:29 +01:00
Thinkofdeath
3139af91dc Fix broken hopper logic when moving more than one item in a stack 2014-04-24 20:07:39 +01:00
md_5
74c275f71c Upstream merge 2014-04-24 16:33:42 +10:00
Thinkofdeath
7cae4cb66f Actually remove the old patches 2014-04-23 12:48:39 +01:00
Thinkofdeath
3c59415aa1 Remove NBTTagCompound and related patches 2014-04-23 12:44:02 +01:00
Thinkofdeath
908927b6ef Silence skull related console spam 2014-04-23 10:40:32 +01:00
David
1b91579091 Remove a line that would otherwise just be reiterating a set int 2014-04-23 02:04:25 +01:00
David
86941d3883 Prevent anvils from eating the spare items in the second slot 2014-04-23 01:05:25 +01:00
David
b28f1ead6d Prevent the console from locing up, due to too many messages flooding it, but only notifing of issue of the server crashes 2014-04-21 12:56:06 +01:00
David
755ba081f2 Swallow StackOverflowError when updating physics. 
Prevents an otherwise unneeded crash.
 2014-04-21 17:02:17 +10:00
Thinkofdeath
9624ae9d3d Convert player skulls async 2014-04-20 14:07:59 +01:00
md_5
ca27a33e84 Don't special case 'invalid' usernames for UUIDs. 
This renders any automatically generated username to have the same UUID, thus make pseudo players somewhat limited. When using such names for scoreboards etc you should be using our enhanced String based scoreboard API anyway.
Thanks @ElgarL for pointing this out.
 2014-04-20 18:59:04 +10:00
md_5
28eddfcc38 Log null TileEntity Owner. 
Should prevent a crash and provide some info on the location.
 2014-04-20 11:17:14 +10:00
md_5
421be6f37e Add items per tick to the hopper configurations 2014-04-19 09:22:44 +10:00
md_5
50a70a29e4 More upstream merge 2014-04-19 09:15:37 +10:00
Thinkofdeath
0908362738 Treat color codes as an end of a url 2014-04-18 19:27:20 +00:00
Thinkofdeath
a118e4c40d Upstream merge 2014-04-18 17:08:19 +00:00
Thinkofdeath
4342681445 Upstream merge: 1.7.9 2014-04-17 20:50:10 +01:00
Thinkofdeath
05bb44c24b Stop player skull's name being incorrectly set to the profiles's toString 2014-04-17 13:02:29 +01:00
md_5
7c5eaf30f1 Add Score.isScoreSet()Z API. 
Also fix generics on CraftScore.getScore()I.
 2014-04-17 19:36:09 +10:00
md_5
b2c227e89c Expand team API to allow arbitrary strings. 2014-04-17 19:22:33 +10:00
md_5
05b9fd72af Fix BanList command and other *list functionality 2014-04-17 19:03:18 +10:00
Aikar
1d37fe9bbe Convert Horses owner to UUID 2014-04-16 16:14:26 +10:00
md_5
39a3d7dde1 Correct Ban Expiration 2014-04-16 11:14:49 +10:00
md_5
2c68786295 Fix ban expire dates. 2014-04-16 10:10:38 +10:00
md_5
90246b4c94 Print stack only when debug is enabled 2014-04-16 10:00:53 +10:00
md_5
4da2a9b07a Validate CraftSkull getOwner - prevents it from being called when hasOwner is false. 2014-04-16 09:47:03 +10:00
md_5
05a8645290 Allow non hidden update lock 2014-04-15 19:28:39 +10:00
mrapple
9360048150 Fix EditBook Event 2014-04-15 12:17:49 +10:00
md_5
10a61a9d08 Remove whitelist fix patch, pulled upstream & also slightly incorrect, userCache.a() does not perform a full lookup. 2014-04-15 12:03:38 +10:00
md_5
f2d99a6bf3 Check Skull canPlace - ensures skulls are only placed where they are supposed to. 2014-04-15 10:48:55 +10:00
md_5
dff782210a Fix Player Banning 
This issue stems from the fact that Bukkit's API only allows a UUID to be banned, but Minecraft requires both a UUID and name. To fix this we modify the code to require a UUID or a name, or both. The correct fix would be expanding the API to be able to provide a name, however this would require plugin changes.
 2014-04-15 10:32:55 +10:00
md_5
64eb4b8327 Fix despawn rate to be >= 2014-04-15 09:37:11 +10:00
Thinkofdeath
7313a6b822 Fix arrows and fireworks not having their despawn counters ticked when inactive 2014-04-14 17:22:45 +01:00
md_5
72d5f50bb7 Check for Blank OfflinePlayer Names - the internal representation does not allow them, so lets catch it early when the issue lies with the user. 2014-04-14 17:22:57 +10:00
md_5
3e2a7bb17c Add note about BungeeCord 2014-04-14 14:55:06 +10:00
md_5
282ba1fdc7 Upstream merge 2014-04-14 14:35:29 +10:00
Fabian Fassbender
eff9004f15 Add skin forwarding support for BungeeCord. 2014-04-14 11:41:45 +10:00
Devin Ryan
5483861924 Prevent crash from a ConversationTracker exception. Fixes BUKKIT-5436 2014-04-14 11:34:57 +10:00
md_5
0410a40c1f Add obfuscation helper patch to assist update process. 2014-04-14 10:42:54 +10:00
md_5
e11d481452 Use Provided Case for Non Existent Offline Players. 
Fixes issues with using scoreboards to provide information via pseudo players being all lower cased.
 2014-04-14 09:48:49 +10:00
gjmcferrin@gmail.com
c9c88ab4c8 Properly cancel fishing event. Fixes BUKKIT-5396 
Previously, when cancelling a PlayerFishEvent with State.FISHING, the next
fishing attempt would automatically result in a new PlayerFishEvent with
State.FAILED_ATTEMPT because the player's hooked entity was not properly
cleared. This ensures that the player's hooked entity value is set to null so
that the next attempt will result in the proper state being called.
 2014-04-13 20:13:56 +10:00
myiume
c6140eafcc Fix PlayerFishEvent not properly cancelling. Fixes 
BUKKIT-5245,BUKKIT-5396

PlayerFishEvent event states are not properly being cancelled,
the FishingHookEntity being deleted when the event is cancelled,
thus making the event happen. The event states of CAUGHT_ENTITY,
CAUGHT_FISH, FAILED_ATTEMPT, IN_GROUND must keep the
EntityFishingHook alive in order to cancel the event.
Removed the entity despawn lines when event is cancelled
and added a cancelled action for FAILED_ATTEMPT state.
 2014-04-13 20:13:13 +10:00
md_5
84643687e6 Fix more missed diff - IPs not showing in console 2014-04-13 16:35:17 +10:00
md_5
1384382aeb Use Correct firstPlayed Value. 2014-04-13 14:46:03 +10:00
md_5
eba34fbe49 Use Offline Player Data Once if Required. 
If we are online mode and the only copy of player data we can find is the player's offline mode data, we will attempt a once off conversion by reading this data and then renaming the file so it won't be used again.
 2014-04-13 14:41:33 +10:00
md_5
73eca94c45 Print Stack on InternalException - for debugging some ConcurrentMod issues. 2014-04-13 09:01:16 +10:00
Thinkofdeath
d30c334bd3 Fix patch numbers 
Changes nothing but it was bugging me
 2014-04-12 16:00:16 +01:00
md_5
e5012f8abf Let the user know we are trying to convert. Gotta figure out whats up with Mojang's API. 2014-04-12 23:31:14 +10:00
md_5
8bb505c271 Add huge update warning. This server will not start until the user types Y E S into the console. 2014-04-12 21:37:38 +10:00
md_5
247236b793 Treat Bungee as Online Mode. This is very important for people, IP forwarding MUST be enabled. 2014-04-12 21:24:25 +10:00
md_5
4755809a62 Tigthen up access to getVersion - should help with some disconnects. Great spot by @thinkofdeath 2014-04-12 19:06:58 +10:00
md_5
4976381ad8 Fix missed variable in entity activation range 2014-04-12 19:01:59 +10:00
md_5
fad54a7a3e Upstream merge 2014-04-12 18:17:59 +10:00
md_5
a3b28bf525 Fix more legacy support 2014-04-12 18:15:24 +10:00
md_5
2a02b37ac2 Strip dashes when sending UUIDs to older clients. 2014-04-12 18:04:17 +10:00
md_5
8971d2afa7 Fix several occurances of missed diff. 2014-04-12 17:49:22 +10:00
md_5
ec9e487811 Address Serious Issues with Offline Players 
Such as name being entirely unresolved! This fixes the whitelist command and no doubt lots more.
 2014-04-12 17:17:26 +10:00
md_5
75deb2c530 Revert "Print Warning not Stack Trace." 
This reverts commit 7edfec9059.
 2014-04-12 15:29:45 +10:00
md_5
7edfec9059 Print Warning not Stack Trace. 
When loading the data .json files.
 2014-04-12 15:18:33 +10:00
md_5
998bcd056a Old / New Version Support. 
This adds support for newer / older Minecraft versions.
At present it supports protocol versions 4 and 5 (1.7.2-1.7.8).
 2014-04-12 15:11:23 +10:00
md_5
c467867aca Finish up Minecraft 1.7.8 support. This is a dev build, no warranty etc etc. It does not yet support Minecraft 1.7.2/1.7.5. 2014-04-12 14:49:42 +10:00
md_5
c2dd459650 Nearly done, testing time. 2014-04-12 14:38:17 +10:00
md_5
06b0dec1c5 Fix some stuff 2014-04-12 14:27:04 +10:00
md_5
205b113b18 Stage 1.5 2014-04-12 14:18:50 +10:00
md_5
83ce6724ca Stage 1 2014-04-12 14:18:37 +10:00
md_5
7a108da7f3 Remove some snapshot related patches in preparation for update. 2014-04-12 14:01:22 +10:00
Thinkofdeath
b32a7595bf Remove the server skin validation 
Doesn't really help in catching the plugins causing the issues
 2014-04-11 16:13:15 +01:00
Thinkofdeath
40570f5b14 Display 1.7.8 as the current version 2014-04-11 15:46:24 +01:00
Thinkofdeath
3f8ecf497b Validate skins server side to try catch some out of date plugins 2014-04-11 13:08:04 +01:00
Thinkofdeath
c499672aef Display 'Spigot' in client crashes, server lists and Mojang stats 2014-04-11 11:55:29 +01:00
Thinkofdeath
80e3edb2b2 Find and fix broken player skulls and handle skulls with incorrectly cased player names 2014-04-10 21:59:55 +01:00
Thinkofdeath
11fe7bede1 Lets say this didn't happen 2014-04-10 21:23:07 +01:00
Thinkofdeath
63233d4a0e Don't convert skulls if the request fails for some reason 2014-04-10 21:12:49 +01:00
Thinkofdeath
a67082c90e Use authlib to look up skull textures. 
Might cover a case I missed
 2014-04-10 17:45:21 +01:00
Thinkofdeath
1e1ba0f873 Fix the console issue 
QueueLogAppender doesn't like being added twice
 2014-04-10 12:56:45 +01:00
Thinkofdeath
74fe17c43b Fix 1.7.7 support (Bungee will still have issues) 2014-04-10 11:56:42 +01:00
Thinkofdeath
8a1c663032 Check the length of the response as the API can sometimes be incorrect 2014-04-09 20:44:07 +01:00
Thinkofdeath
5f03f206c3 Don't spam warnings when Mojang's API goes down. (Which happens a lot) 2014-04-09 15:22:36 +01:00
Thinkofdeath
98825a6430 Close the inputstreams/connections used for head conversion 2014-04-09 14:54:31 +01:00
Thinkofdeath
e95737ad2c Convert player heads async 2014-04-09 13:53:23 +01:00
Thinkofdeath
4c69717e7b Prevent player skulls from crashing 1.7.6 clients. They'll be missing their textures due skin changes 2014-04-08 13:38:47 +01:00
Thinkofdeath
ac8f1531ec Merge remote-tracking branch 'remotes/origin/1.7.6' 2014-04-08 12:23:47 +01:00
Thinkofdeath
35048d22f5 Pass the offline/bungee uuid to PreLogin events (Closes #147) 2014-04-07 00:42:38 +01:00
Thinkofdeath
7103dff380 Add 1.7.6pre1 support. 
This doesn't require any configuration changes and will support 1.7.2 / 1.7.5 etc as well.
 2014-04-05 09:11:28 +11:00
Thinkofdeath
ded44c47f0 Upstream merge 2014-04-03 21:12:44 +01:00
Thinkofdeath
2bf205d5f9 Fixed mob spawners being treated as solid blocks for the orebfuscator 
Mob spawners are treated as solid blocks as far as the game is concerned for lighting and other tasks but for rendering they can be seen through, therefor we special case them so that the antixray doesn't show the fake blocks around them.
 2014-04-03 10:50:48 +01:00
md_5
710f33af71 Correct patch start comment. 2014-04-02 18:05:47 +11:00
Ginger Geek
fe031329f3 Allows greater control over Tab Command Complete. 
You can now specify how many letters of the command must be typed before it will be tab completed this will help deter people from just spamming round all the commands to see if there is one incorrectly set up.
0 will tab complete all commands
-1 will disable tab complete

1 will mean you have to type the first letter
2 will mean you have to the second letter... etc...
 2014-04-02 18:01:40 +11:00
md_5
04d72bc702 Merge some stuff from upstream. 2014-04-02 17:54:35 +11:00
FrozenBrain
a562fecb4b Fix TileEntities getting ticked after being queued for removal 2014-04-02 17:53:34 +11:00
drXor
2fb9953244 Configurable boss sound radii. 2014-04-02 17:49:11 +11:00
Thinkofdeath
b4686b49be Replace the village window patch with one that effects all windows (Closes #143) 2014-03-30 17:00:57 +01:00
md_5
c349a2493b Prevent the inevitable server lag|crashes caused by people doing a blocking operation on the main thread. 2014-03-30 09:16:12 +11:00
md_5
f5167c9e46 Upstream: Add more expansive UUID based operations 2014-03-30 09:09:24 +11:00
Thinkofdeath
6bba77bba3 Re-add a fixed version of the "Improved Ping Sending" patch 2014-03-28 21:54:36 +00:00
Thinkofdeath
0f0c2734df address -> realAddress 2014-03-27 11:53:41 +00:00
md_5
97a67451a5 Fix several occurances of missed diff between the current version of mc-dev. 2014-03-27 16:01:20 +11:00
Thinkofdeath
0c70e688f7 Use the right constructor for bungeecord support 2014-03-26 23:53:19 +00:00
Thinkofdeath
152e14cadc Remove the Improved Ping Sending patch 2014-03-26 20:34:47 +00:00
Thinkofdeath
fdfc07bd39 Handle case where currentTick could be negative 
@Aikar is there a better way to handle this?
 2014-03-26 15:18:11 +00:00
md_5
48d7a1a40f Make restart command ignore async checks. This is needed for the watchdog to properly restart. 2014-03-25 16:13:09 +11:00
md_5
5164642604 Remove async op catcher to its own class 2014-03-25 16:11:45 +11:00